From: Tim Yamin Date: Sat, 27 Nov 2004 18:57:28 +0000 (+0000) Subject: Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 and... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9af7e23e148edfabd9e548ef5652a8b665eabbcc;p=gentoo.git Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 and #72317. --- diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog index f4251101a173..a9bc09bb9eb6 100644 --- a/sys-kernel/wolk-sources/ChangeLog +++ b/sys-kernel/wolk-sources/ChangeLog @@ -1,6 +1,17 @@ # 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.61 2004/11/20 15:11:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.62 2004/11/27 18:57:28 plasmaroo Exp $ + +*wolk-sources-4.9-r18 (27 Nov 2004) + + 27 Nov 2004; -wolk-sources-4.11-r13.ebuild, + +wolk-sources-4.11-r14.ebuild, -wolk-sources-4.14-r10.ebuild, + +wolk-sources-4.14-r11.ebuild, -wolk-sources-4.15-r3.ebuild, + +wolk-sources-4.15-r4.ebuild, -wolk-sources-4.9-r17.ebuild, + +wolk-sources-4.9-r18.ebuild, +files/wolk-sources.AF_UNIX.patch, + +files/wolk-sources.binfmt_a.out.patch: + Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 + and #72317. *wolk-sources-4.14-r10 (20 Nov 2004) diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest index 1bf7a97fd7e9..2076bf46bf4b 100644 --- a/sys-kernel/wolk-sources/Manifest +++ b/sys-kernel/wolk-sources/Manifest @@ -1,16 +1,15 @@ -MD5 91a236e4c6fe9750c2c156a969f20b7c ChangeLog 20087 +MD5 d8098be844e8c32e4dc480879a02d118 ChangeLog 20585 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226 -MD5 3bda7c3e6d1d19bed00853b005cb232a wolk-sources-4.11-r13.ebuild 3293 -MD5 0f32c1c76fd5f650e9c25aa6ccd36d4c wolk-sources-4.9-r17.ebuild 6316 -MD5 8ab650923c348babe29003f3e6c71c36 wolk-sources-4.14-r10.ebuild 2538 -MD5 8a80bc94b438ef1bee49de553f8933d4 wolk-sources-4.15-r3.ebuild 1650 +MD5 8f77e25c4dabd3d1ad28b1b33f7d41f0 wolk-sources-4.14-r11.ebuild 2609 +MD5 eac203134a13a9fd63d4ea4deb6afbf9 wolk-sources-4.9-r18.ebuild 6494 +MD5 ee7852b5a8aa249aed80a37376968d91 wolk-sources-4.15-r4.ebuild 1722 +MD5 bbf6502fc06f70f38910a62efae92d24 wolk-sources-4.11-r14.ebuild 3471 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-r10 248 -MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r3 227 +MD5 b0a1f80aff51d6601e8924329023b241 files/wolk-sources.AF_UNIX.patch 515 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065 MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424 -MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r13 392 +MD5 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r18 1480 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531 MD5 a4cb2b30bc0ad5f4f3913a6ec2ddfe1a files/wolk-sources.binfmt_elf.patch 2618 @@ -20,16 +19,19 @@ MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 1754 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 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r17 1480 +MD5 b9a94233e1457787352e5f85e3e3582d files/wolk-sources.binfmt_a.out.patch 2009 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350 MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/wolk-sources.smbfs.patch 3434 MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777 +MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r11 248 MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233 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 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r14 392 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414 +MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r4 227 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 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r13 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r14 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r13 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r14 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r10 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r11 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r10 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r11 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r3 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r4 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r3 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r4 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r17 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r18 similarity index 100% rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r17 rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r18 diff --git a/sys-kernel/wolk-sources/files/wolk-sources.AF_UNIX.patch b/sys-kernel/wolk-sources/files/wolk-sources.AF_UNIX.patch new file mode 100644 index 000000000000..6ced78404a2d --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources.AF_UNIX.patch @@ -0,0 +1,24 @@ +--- linux-2.4.27/net/unix/af_unix.c 2004-11-24 08:23:21 -08:00 ++++ linux-2.4.28/net/unix/af_unix.c 2004-11-24 08:23:21 -08:00 +@@ -1403,9 +1403,11 @@ + + msg->msg_namelen = 0; + ++ down(&sk->protinfo.af_unix.readsem); ++ + skb = skb_recv_datagram(sk, flags, noblock, &err); + if (!skb) +- goto out; ++ goto out_unlock; + + wake_up_interruptible(&sk->protinfo.af_unix.peer_wait); + +@@ -1449,6 +1451,8 @@ + + out_free: + skb_free_datagram(sk,skb); ++out_unlock: ++ up(&sk->protinfo.af_unix.readsem); + out: + return err; + } diff --git a/sys-kernel/wolk-sources/files/wolk-sources.binfmt_a.out.patch b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_a.out.patch new file mode 100644 index 000000000000..4644ae28bce4 --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_a.out.patch @@ -0,0 +1,63 @@ +diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c +--- linux-2.4.28/fs/exec.c 2004-04-15 10:44:45 -07:00 ++++ linux-2.4.28.plasmaroo/fs/exec.c 2004-11-12 12:02:40 -08:00 +@@ -342,6 +342,7 @@ int setup_arg_pages(struct linux_binprm + + down_write(¤t->mm->mmap_sem); + { ++ struct vm_area_struct *vma; + mpnt->vm_mm = current->mm; + mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p; + mpnt->vm_end = STACK_TOP; +@@ -351,6 +352,12 @@ int setup_arg_pages(struct linux_binprm + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = (void *) 0; ++ vma = find_vma(current->mm, mpnt->vm_start); ++ if (vma) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return -ENOMEM; ++ } + insert_vm_struct(current->mm, mpnt); + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } +diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c +--- linux-2.4.28/fs/binfmt_aout.c 2002-02-04 23:54:04 -08:00 ++++ linux-2.4.28.plasmaroo/fs/binfmt_aout.c 2004-11-12 11:55:14 -08:00 +@@ -39,13 +39,18 @@ static struct linux_binfmt aout_format = + NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE + }; + +-static void set_brk(unsigned long start, unsigned long end) ++#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) ++ ++static int set_brk(unsigned long start, unsigned long end) + { + start = PAGE_ALIGN(start); + end = PAGE_ALIGN(end); +- if (end <= start) +- return; +- do_brk(start, end - start); ++ if (end > start) { ++ unsigned long addr = do_brk(start, end - start); ++ if (BAD_ADDR(addr)) ++ return addr; ++ } ++ return 0; + } + + /* +@@ -405,7 +410,11 @@ static int load_aout_binary(struct linux + beyond_if: + set_binfmt(&aout_format); + +- set_brk(current->mm->start_brk, current->mm->brk); ++ retval = set_brk(current->mm->start_brk, current->mm->brk); ++ if (retval < 0) { ++ send_sig(SIGKILL, current, 0); ++ return retval; ++ } + + retval = setup_arg_pages(bprm); + if (retval < 0) { diff --git a/sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r14.ebuild similarity index 93% rename from sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.11-r14.ebuild index 1d43281c20dc..16a2d16fc565 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r14.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-r13.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r14.ebuild,v 1.1 2004/11/27 18:57:28 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -53,6 +53,8 @@ src_unpack() { 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!" epatch ${FILESDIR}/${PN}.smbfs.patch || die "Failed to apply the SMBFS patch!" + epatch ${FILESDIR}/${PN}.AF_UNIX.patch || die "Failed to apply the AF_UNIX patch!" + epatch ${FILESDIR}/${PN}.binfmt_a.out.patch || die "Failed to apply the binfmt_a.out patch!" kernel_universal_unpack } diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r11.ebuild similarity index 93% rename from sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.14-r11.ebuild index 54ae86ee8941..04e2561b080f 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r11.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-r10.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r11.ebuild,v 1.1 2004/11/27 18:57:28 plasmaroo Exp $ OKV="2.4.20" OKB="2.4" @@ -41,7 +41,9 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}.cmdlineLeak.patch ${FILESDIR}/${PN}.XDRWrapFix.patch ${FILESDIR}/${PN}.binfmt_elf.patch - ${FILESDIR}/${PN}.smbfs.patch" + ${FILESDIR}/${PN}.smbfs.patch + ${FILESDIR}/${PN}.AF_UNIX.patch + ${FILESDIR}/${PN}.binfmt_a.out.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-r3.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.15-r4.ebuild similarity index 90% rename from sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.15-r4.ebuild index 74d5eebb5bf4..18a9ef171718 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.15-r4.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-r3.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.15-r4.ebuild,v 1.1 2004/11/27 18:57:28 plasmaroo Exp $ # Ramereth's contributed WOLK ebuild - thanks! (you didn't think you'd # go blameless, did you?) @@ -11,7 +11,10 @@ UNIPATCH_LIST=" ${FILESDIR}/binfmt_elf.patch ${FILESDIR}/${PN}.XDRWrapFix.patch ${FILESDIR}/${PN}.binfmt_elf.patch - ${FILESDIR}/${PN}.smbfs.patch" + ${FILESDIR}/${PN}.smbfs.patch + ${FILESDIR}/${PN}.AF_UNIX.patch + ${FILESDIR}/${PN}.binfmt_a.out.patch" + UNIPATCH_STRICTORDER="yes" OKV="2.4.20" diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r18.ebuild similarity index 96% rename from sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild rename to sys-kernel/wolk-sources/wolk-sources-4.9-r18.ebuild index b2ac16a7dc41..02b20cc87bff 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r18.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-r17.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r18.ebuild,v 1.1 2004/11/27 18:57:28 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -98,6 +98,8 @@ src_unpack() { 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!" epatch ${FILESDIR}/${PN}.smbfs.patch || die "Failed to apply the SMBFS patch!" + epatch ${FILESDIR}/${PN}.AF_UNIX.patch || die "Failed to apply the AF_UNIX patch!" + epatch ${FILESDIR}/${PN}.binfmt_a.out.patch || die "Failed to apply the binfmt_a.out patch!" kernel_universal_unpack }