r1996 - in trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: 2004-12-13 21:31:46 -0700 (Mon, 13 Dec 2004)
New Revision: 1996

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/114-binfmt_aout-CAN-2004-1074.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/series/2.4.28-1
Log:
merge the a.out fix forward to 2.4.28

Modified: trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/changelog	2004-12-14 04:24:27 UTC (rev 1995)
+++ trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/changelog	2004-12-14 04:31:46 UTC (rev 1996)
@@ -25,8 +25,10 @@
       cramfs ramdisks to successfully load on some sparc32s
     - 096_megaraid2_proc_name.diff: Change proc_name for megaraid2 to
       megaraid2, so the right module is inserted into the ramdisk
+    - 114-binfmt_aout-CAN-2004-1074.diff: [SECURITY] Fix potential oops in
+      the a.out binfmt code (CAN-2004-1074) (dann frazier)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Mon, 22 Nov 2004 23:05:29 -0800
+ -- dann frazier <dannf@debian.org>  Mon, 13 Dec 2004 21:29:43 -0700
 
 kernel-source-2.4.27 (2.4.27-6) unstable; urgency=low
 

Copied: trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/114-binfmt_aout-CAN-2004-1074.diff (from rev 1993, trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/114-binfmt_aout-CAN-2004-1074.diff)

Modified: trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/series/2.4.28-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/series/2.4.28-1	2004-12-14 04:24:27 UTC (rev 1995)
+++ trunk/kernel-2.4/source/kernel-source-2.4.28-2.4.28/debian/patches/series/2.4.28-1	2004-12-14 04:31:46 UTC (rev 1996)
@@ -94,4 +94,4 @@
 
 + 095_sparc32_initrd_memcpy.diff
 + 096_megaraid2_proc_name.diff
-
++ 114-binfmt_aout-CAN-2004-1074.diff