From b0a0a854e1cd4c4fa705aa639172146925acfe6d Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Fri, 12 Nov 2004 21:01:30 +0000 Subject: [PATCH] Version bump for the binfmt_elf security vulnerability, bug #70681. --- sys-kernel/wolk-sources/ChangeLog | 11 ++- sys-kernel/wolk-sources/Manifest | 19 +++-- ...-4.11-r11 => digest-wolk-sources-4.11-r12} | 0 ...es-4.14-r8 => digest-wolk-sources-4.14-r9} | 0 ...es-4.15-r1 => digest-wolk-sources-4.15-r2} | 0 ...es-4.9-r15 => digest-wolk-sources-4.9-r16} | 0 .../files/wolk-sources.binfmt_elf.patch | 84 +++++++++++++++++++ ...11.ebuild => wolk-sources-4.11-r12.ebuild} | 4 +- ...-r8.ebuild => wolk-sources-4.14-r9.ebuild} | 5 +- ...-r1.ebuild => wolk-sources-4.15-r2.ebuild} | 5 +- ...r15.ebuild => wolk-sources-4.9-r16.ebuild} | 3 +- 11 files changed, 115 insertions(+), 16 deletions(-) rename sys-kernel/wolk-sources/files/{digest-wolk-sources-4.11-r11 => digest-wolk-sources-4.11-r12} (100%) rename sys-kernel/wolk-sources/files/{digest-wolk-sources-4.14-r8 => digest-wolk-sources-4.14-r9} (100%) rename sys-kernel/wolk-sources/files/{digest-wolk-sources-4.15-r1 => digest-wolk-sources-4.15-r2} (100%) rename sys-kernel/wolk-sources/files/{digest-wolk-sources-4.9-r15 => digest-wolk-sources-4.9-r16} (100%) create mode 100644 sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch rename sys-kernel/wolk-sources/{wolk-sources-4.11-r11.ebuild => wolk-sources-4.11-r12.ebuild} (95%) rename sys-kernel/wolk-sources/{wolk-sources-4.14-r8.ebuild => wolk-sources-4.14-r9.ebuild} (94%) rename sys-kernel/wolk-sources/{wolk-sources-4.15-r1.ebuild => wolk-sources-4.15-r2.ebuild} (91%) rename sys-kernel/wolk-sources/{wolk-sources-4.9-r15.ebuild => wolk-sources-4.9-r16.ebuild} (97%) diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog index 50deb3f74d7e..96099769e489 100644 --- a/sys-kernel/wolk-sources/ChangeLog +++ b/sys-kernel/wolk-sources/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-kernel/wolk-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.59 2004/11/08 22:44:29 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.60 2004/11/12 21:01:30 plasmaroo Exp $ + +*wolk-sources-4.15-r2 (12 Nov 2004) + + 12 Nov 2004; -wolk-sources-4.11-r11.ebuild, + +wolk-sources-4.11-r12.ebuild, -wolk-sources-4.14-r8.ebuild, + +wolk-sources-4.14-r9.ebuild, -wolk-sources-4.15-r1.ebuild, + +wolk-sources-4.15-r2.ebuild, -wolk-sources-4.9-r15.ebuild, + +wolk-sources-4.9-r16.ebuild, +files/wolk-sources.binfmt_elf.patch: + Version bump for the binfmt_elf security vulnerability, bug #70681. *wolk-sources-4.11-r11 (08 Nov 2004) diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest index d9d9853ba7e0..7f1c0ff9eaf7 100644 --- a/sys-kernel/wolk-sources/Manifest +++ b/sys-kernel/wolk-sources/Manifest @@ -1,36 +1,37 @@ -MD5 ff74222469fda41427a567541b9e7e16 ChangeLog 19149 -MD5 303a35c61a6dbb7f1d62c3a549be7afa wolk-sources-4.11-r11.ebuild 3122 -MD5 881a772a18b1e1c29316ff63e2a88607 wolk-sources-4.14-r8.ebuild 2470 +MD5 6fe377eeccb617cb6b7297d6a0d2caa5 ChangeLog 19583 +MD5 8acace8673fba0a5ace93af6d2623ab3 wolk-sources-4.9-r16.ebuild 6236 +MD5 7fe7bb3855a94802c50d9f97b3f13e03 wolk-sources-4.14-r9.ebuild 2506 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226 -MD5 108e9ae48022076f0cfe01fba690ac39 wolk-sources-4.15-r1.ebuild 1583 -MD5 fe292cb4572271ae8dea36793d04d4e2 wolk-sources-4.9-r15.ebuild 6146 +MD5 fdd56c83ddd4c52b7149bba2dc5164af wolk-sources-4.11-r12.ebuild 3213 +MD5 a1a6481188f95a89c897e896d41b3fc0 wolk-sources-4.15-r2.ebuild 1619 MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635 +MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r9 248 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065 MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531 -MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r11 392 +MD5 ff260e3c42d263d7ef1a579eaa38e5e6 files/wolk-sources.binfmt_elf.patch 2237 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427 MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354 MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549 MD5 2ca46d61e534cfd18a965e9ae8e870e2 files/binfmt_elf.patch 2347 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707 -MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r1 227 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350 MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747 MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777 MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233 +MD5 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r16 1480 MD5 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809 MD5 d1ccc2047be533c992f67270a150a210 files/wolk-sources.cmdlineLeak.patch 388 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893 -MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r8 248 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414 +MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r12 392 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/wolk-sources.XDRWrapFix.patch 1499 MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384 -MD5 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r15 1480 +MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r2 227 MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r11 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r12 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r11 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r12 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r8 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r9 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r8 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r9 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r1 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r2 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r1 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r2 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r15 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r16 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r15 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r16 diff --git a/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch new file mode 100644 index 000000000000..bce026adf312 --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch @@ -0,0 +1,84 @@ +diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt_elf.c +--- linux-2.4.27-gentoo-r2/fs/binfmt_elf.c 2004-11-10 20:43:18.000000000 +0000 ++++ linux-2.4.27-gentoo-r3/fs/binfmt_elf.c 2004-11-10 20:33:40.000000000 +0000 +@@ -308,9 +308,12 @@ + goto out; + + retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size); +- error = retval; +- if (retval < 0) ++ error = -EIO; ++ if (retval != size) { ++ if (retval < 0) ++ error = retval; + goto out_close; ++ } + + eppnt = elf_phdata; + for (i=0; ie_phnum; i++, eppnt++) { +@@ -686,8 +689,11 @@ + goto out; + + retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size); +- if (retval < 0) ++ if (retval != size) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_ph; ++ } + + files = current->files; /* Refcounted so ok */ + retval = unshare_files(); +@@ -734,8 +740,14 @@ + retval = kernel_read(bprm->file, elf_ppnt->p_offset, + elf_interpreter, + elf_ppnt->p_filesz); +- if (retval < 0) ++ if (retval != elf_ppnt->p_filesz) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_interp; ++ } ++ /* make sure path is NULL terminated */ ++ elf_interpreter[elf_ppnt->p_filesz - 1] = '\0'; ++ + /* If the program interpreter is one of these two, + * then assume an iBCS2 image. Otherwise assume + * a native linux image. +@@ -754,8 +766,11 @@ + if (IS_ERR(interpreter)) + goto out_free_interp; + retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE); +- if (retval < 0) ++ if (retval != BINPRM_BUF_SIZE) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_dentry; ++ } + + /* Get the exec headers */ + interp_ex = *((struct exec *) bprm->buf); +@@ -967,7 +982,10 @@ + #endif + + if (BAD_ADDR(error)) +- continue; ++ { ++ send_sig(SIGKILL, current, 0); ++ goto out_free_dentry; ++ } + + /* PaX: mirror at a randomized base */ + down_write(¤t->mm->mmap_sem); +@@ -1008,7 +1026,10 @@ + { + error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags); + if (BAD_ADDR(error)) +- continue; ++ { ++ send_sig(SIGKILL, current, 0); ++ goto out_free_dentry; ++ } + } + + if (!load_addr_set) { diff --git a/sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild similarity index 95% rename from sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild index fc7c86405b9e..f2db8751b49a 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r12.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/wolk-sources/wolk-sources-4.11-r11.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -51,6 +51,8 @@ src_unpack() { epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" epatch ${FILESDIR}/${PN}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" epatch ${FILESDIR}/${PN}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!" + epatch ${FILESDIR}/${PN}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!" + kernel_universal_unpack } diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild similarity index 94% rename from sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild index c0b5ac5fd514..ce3259266e2e 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r9.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/wolk-sources/wolk-sources-4.14-r8.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ OKV="2.4.20" OKB="2.4" @@ -39,7 +39,8 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}.CAN-2004-0685.patch ${FILESDIR}/${PN}.FPULockup-53804.patch ${FILESDIR}/${PN}.cmdlineLeak.patch - ${FILESDIR}/${PN}.XDRWrapFix.patch" + ${FILESDIR}/${PN}.XDRWrapFix.patch + ${FILESDIR}/${PN}.binfmt_elf.patch" #============================================================================ # We'll override the src_unpack() function from the eclass. This is necessary diff --git a/sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild similarity index 91% rename from sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild index aea701d0fe84..09a873ac8139 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.15-r2.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/wolk-sources/wolk-sources-4.15-r1.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ # Ramereth's contributed WOLK ebuild - thanks! (you didn't think you'd # go blameless, did you?) @@ -9,7 +9,8 @@ UNIPATCH_LIST=" ${DISTDIR}/${WOLK_SRC} ${DISTDIR}/${P}-CAN-2004-0814.patch ${FILESDIR}/binfmt_elf.patch - ${FILESDIR}/${PN}.XDRWrapFix.patch" + ${FILESDIR}/${PN}.XDRWrapFix.patch + ${FILESDIR}/${PN}.binfmt_elf.patch" UNIPATCH_STRICTORDER="yes" OKV="2.4.20" diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild similarity index 97% rename from sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild index 1bee87dd8504..e01467717fe7 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r16.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/wolk-sources/wolk-sources-4.9-r15.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -96,6 +96,7 @@ src_unpack() { epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" epatch ${FILESDIR}/${PN}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" epatch ${FILESDIR}/${PN}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!" + epatch ${FILESDIR}/${PN}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!" kernel_universal_unpack } -- 2.26.2