r2902 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Simon Horman]

Author: horms
Date: 2005-04-04 01:24:25 +0000 (Mon, 04 Apr 2005)
New Revision: 2902

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/158_fs-binfmt_elf-dos.diff
Log:
Part of this patch was incorrectly removed (by me)

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/158_fs-binfmt_elf-dos.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/158_fs-binfmt_elf-dos.diff	2005-04-03 22:22:13 UTC (rev 2901)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/158_fs-binfmt_elf-dos.diff	2005-04-04 01:24:25 UTC (rev 2902)
@@ -3,7 +3,7 @@
 # URL: http://linux.bkbits.net:8080/linux-2.4/cset@4244930dPN44h62CZtM0P-qXoOI-7A
 # inclusion: upstream
 # descrition: CAN-2005-0794: Potential DOS in load_elf_library
-# revision date: Wed, 30 Mar 2005 17:50:31 +0900
+# revision date: Mon, 04 Apr 2005 10:14:26 +0900
 #
 # S rset: ChangeSet|1.1481..1.1482
 # R rset: fs/binfmt_elf.c|1.40..1.41
@@ -42,6 +42,14 @@
 #
 --- a/fs/binfmt_elf.c	2005-03-30 18:28:49.000000000 +0900
 +++ b/fs/binfmt_elf.c	2005-03-30 18:31:46.000000000 +0900
+@@ -926,6 +926,7 @@ out_free_ph:
+ static int load_elf_library(struct file *file)
+ {
+ 	struct elf_phdr *elf_phdata;
++	struct elf_phdr *eppnt;
+ 	unsigned long elf_bss, bss, len;
+ 	int retval, error, i, j;
+ 	struct elfhdr elf_ex;
 @@ -939,41 +939,43 @@ static int load_elf_library(struct file 
  	/* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */