binfmt_elf fix

5 files changed, 36 insertions, 16 deletions

diff --git a/sys-kernel/hardened-dev-sources/ChangeLog b/sys-kernel/hardened-dev-sources/ChangeLog
index bed3f2f7e33a..d705c2daae68 100644
--- a/sys-kernel/hardened-dev-sources/ChangeLog
+++ b/sys-kernel/hardened-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/hardened-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.42 2004/11/11 00:18:19 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.43 2004/11/19 02:51:38 method Exp $
+
+*hardened-dev-sources-2.6.7-r12 (18 Nov 2004)
+
+  18 Nov 2004; Joshua Brindle <method@gentoo.org>
+  hardened-dev-sources-2.6.7-r12.ebuild,
+  hardened-dev-sources-2.6.7-r13.ebuild,
+  files/hardened-2.6.7-binfmt_elf.patch:
+  replace binfmt_elf patch with a better one
 
 *hardened-dev-sources-2.6.7-r11 (10 Nov 2004)
 
diff --git a/sys-kernel/hardened-dev-sources/Manifest b/sys-kernel/hardened-dev-sources/Manifest
index 67ca51a9d6f3..b715f5eb3de0 100644
--- a/sys-kernel/hardened-dev-sources/Manifest
+++ b/sys-kernel/hardened-dev-sources/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2f18d764749b5b821f127f9bc36e60f8 hardened-dev-sources-2.6.7-r12.ebuild 1329
 MD5 82fb2e488cf74ed7bdb51f1f521c1fe4 hardened-dev-sources-2.6.7-r8.ebuild 1092
+MD5 27da7aaedb8b53cb58b28a876e804428 hardened-dev-sources-2.6.7-r13.ebuild 1329
 MD5 0b8ab20736a2b68476718b12a797d7ff hardened-dev-sources-2.6.7-r10.ebuild 1163
-MD5 0af7a831541e6c25410ddabf057001e6 ChangeLog 7756
+MD5 0eaea1ae4c425845b3b55d67317ae1f7 ChangeLog 8026
 MD5 73174f8e07b82c5df563b7196f87611c metadata.xml 299
 MD5 6ceac5877bbf8ffb6523d3d671031b73 hardened-dev-sources-2.6.7-r7.ebuild 1089
 MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r10 219
-MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r12 219
+MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r13 219
 MD5 bc48c226344f94535c3ba2e0ce55bf24 files/hardened-dev-sources-2.6.7.CAN-2004-0816.patch 1694
 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch 1033
 MD5 7e3d1d44b244b238ff3e36bfe1f05c80 files/h-d-s-2.6.7-amd64-kill-vm_force_exec32.patch 871
 MD5 d7ed23c76699efe407ec668eeba30b1e files/hardened-2.6.7-binfmt_aout.patch 983
 MD5 efbbfbed471c50333a8c2fd2f2b0b061 files/digest-hardened-dev-sources-2.6.7-r7 219
 MD5 0f763833ebbcbf0f2a8ac151454c3b29 files/digest-hardened-dev-sources-2.6.7-r8 219
-MD5 8c8057d653a02bface4475a62e2debe0 files/hardened-2.6.7-binfmt_elf.patch 1917
+MD5 4dd5aa98c36db5a352be527634d6d9ea files/hardened-2.6.7-binfmt_elf.patch 2245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBlm+yI9RrrOsOLvcRApEMAKC7now34Pg/Q/R8O3f0UOKJ9i8N1wCeK8Nb
-e4TtP//8YV7GYlFuo7Pgfgk=
-=1KKN
+iD8DBQFBnV4sI9RrrOsOLvcRAuCGAJ9c70yQQeXCP+31iEi3Td3P4koUTgCfaAPg
+E/uKCOfMDW7NMECfH87n44M=
+=px6t
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r12 b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r13
index 3ac31c5a42bf..3ac31c5a42bf 100644
--- a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r12
+++ b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r13
diff --git a/sys-kernel/hardened-dev-sources/files/hardened-2.6.7-binfmt_elf.patch b/sys-kernel/hardened-dev-sources/files/hardened-2.6.7-binfmt_elf.patch
index 224f7c010538..f4843ed781c9 100644
--- a/sys-kernel/hardened-dev-sources/files/hardened-2.6.7-binfmt_elf.patch
+++ b/sys-kernel/hardened-dev-sources/files/hardened-2.6.7-binfmt_elf.patch
@@ -1,5 +1,5 @@
---- linux-2.6.7-hardened-r10/fs/binfmt_elf.c	2004-11-13 13:44:36.000000000 -0500
-+++ linux-2.6.7-hardened-r11/fs/binfmt_elf.c	2004-11-13 13:58:33.000000000 -0500
+--- linux-2.6.7-hardened-r10/fs/binfmt_elf.c	2004-11-14 16:41:45.000000000 -0500
++++ linux-2.6.7-hardened-r13/fs/binfmt_elf.c	2004-11-16 21:36:31.000000000 -0500
 @@ -347,9 +347,12 @@
  		goto out;
  
@@ -28,7 +28,17 @@
  
  	files = current->files;		/* Refcounted so ok */
  	retval = unshare_files();
-@@ -815,8 +821,14 @@
+@@ -805,7 +811,8 @@
+ 			 */
+ 
+ 			retval = -ENOMEM;
+-			if (elf_ppnt->p_filesz > PATH_MAX)
++			if (elf_ppnt->p_filesz > PATH_MAX || 
++			    elf_ppnt->p_filesz == 0)
+ 				goto out_free_file;
+ 			elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
+ 							   GFP_KERNEL);
+@@ -815,8 +822,16 @@
  			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
  					   elf_interpreter,
  					   elf_ppnt->p_filesz);
@@ -36,15 +46,17 @@
 +			if (retval != elf_ppnt->p_filesz) {
 +				if (retval >= 0)
 +					retval = -EIO;
- 				goto out_free_interp;
++				goto out_free_interp;
 +			}
 +			/* make sure path is NULL terminated */
-+			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
++			retval = -EINVAL;
++			if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
+ 				goto out_free_interp;
 +			
  			/* If the program interpreter is one of these two,
  			 * then assume an iBCS2 image. Otherwise assume
  			 * a native linux image.
-@@ -851,8 +863,11 @@
+@@ -851,8 +866,11 @@
  			if (IS_ERR(interpreter))
  				goto out_free_interp;
  			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
@@ -57,7 +69,7 @@
  
  			/* Get the exec headers */
  			interp_ex = *((struct exec *) bprm->buf);
-@@ -1105,8 +1120,10 @@
+@@ -1105,8 +1123,10 @@
  			}
  #endif
  
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r12.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r13.ebuild
index e0250a2540a6..e99d9af79b4b 100644
--- a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r12.ebuild
+++ b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r12.ebuild,v 1.1 2004/11/13 20:39:38 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r13.ebuild,v 1.1 2004/11/19 02:51:38 method Exp $
 
 IUSE=""
 ETYPE="sources"