Version bump for the /proc/cmdline leak vulnerability; bug #59905.

9 files changed, 37 insertions, 14 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index bb4f9921876f..bd48b45033ad 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.55 2004/08/08 22:28:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.56 2004/08/10 01:53:22 plasmaroo Exp $
+
+*wolk-sources-4.9-r14 (10 Aug 2004)
+
+  10 Aug 2004; <plasmaroo@gentoo.org> +wolk-sources-4.11-r10.ebuild,
+  -wolk-sources-4.11-r9.ebuild, -wolk-sources-4.14-r6.ebuild,
+  +wolk-sources-4.14-r7.ebuild, -wolk-sources-4.9-r13.ebuild,
+  +wolk-sources-4.9-r14.ebuild, +files/wolk-sources.cmdlineLeak.patch:
+  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
 
 *wolk-sources-4.9-r13 (08 Aug 2004)
 
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 495197760c88..4a891b38468f 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,12 +1,13 @@
-MD5 75db53aaf865942ca12b9f9868298418 ChangeLog 17659
-MD5 fe2ca0c20f30052993eacf985cf61bc6 wolk-sources-4.11-r9.ebuild 2748
+MD5 fbfec3622855e2341e8c651ae724d246 ChangeLog 18030
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
-MD5 a5e49e3160fe1e56160098661a1a48cc wolk-sources-4.14-r6.ebuild 2263
-MD5 c1dc73ea8cbd7494dec4719d9b2abcf9 wolk-sources-4.9-r13.ebuild 5783
+MD5 20bd726173bc0bef01270f1e5a2f1521 wolk-sources-4.14-r7.ebuild 2300
+MD5 b88895bdcf65badf0968a1cf9a31d404 wolk-sources-4.9-r14.ebuild 5877
+MD5 8152311fc4a52d0caaa96c83dfef0326 wolk-sources-4.11-r10.ebuild 2843
 MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
+MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r14 1400
 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877
 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427
@@ -15,16 +16,16 @@ MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 1754
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707
 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
-MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r9 312
 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 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809
+MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r10 312
+MD5 d1ccc2047be533c992f67270a150a210 files/wolk-sources.cmdlineLeak.patch 388
 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
-MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r6 168
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
+MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r7 168
 MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881
-MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r13 1400
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r9 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r10
index efedb836a1f8..efedb836a1f8 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r9
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r10
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r6 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r7
index bca87b6da2e8..bca87b6da2e8 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r6
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r7
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r13 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r14
index a34da13edabb..a34da13edabb 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r13
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r14
diff --git a/sys-kernel/wolk-sources/files/wolk-sources.cmdlineLeak.patch b/sys-kernel/wolk-sources/files/wolk-sources.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.cmdlineLeak.patch
@@ -0,0 +1,11 @@
+--- linux-2.4/fs/proc/base.c	2004-04-15 07:09:32.000000000 +0100
++++ linux-2.4/fs/proc/base.c.plasmaroo	2004-08-09 23:30:43.869195800 +0100
+@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
+ 	if (mm)
+ 		atomic_inc(&mm->mm_users);
+ 	task_unlock(task);
+-	if (mm) {
++	if (mm && mm->arg_end) {
+ 		int len = mm->arg_end - mm->arg_start;
+ 		if (len > PAGE_SIZE)
+ 			len = PAGE_SIZE;
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.11-r9.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r10.ebuild
index 1684af335d49..603f248f116a 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.11-r9.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r10.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-r9.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r10.ebuild,v 1.1 2004/08/10 01:53:22 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	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!"
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r6.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
index d773bbf83538..08a8adae447d 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.14-r6.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r7.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-r6.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild,v 1.1 2004/08/10 01:53:22 plasmaroo Exp $
 
 OKV="2.4.20"
 OKB="2.4"
@@ -35,7 +35,8 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}.CAN-2004-0497.patch
 	${FILESDIR}/${PN}.CAN-2004-0535.patch
 	${FILESDIR}/${PN}.CAN-2004-0685.patch
-	${FILESDIR}/${PN}.FPULockup-53804.patch"
+	${FILESDIR}/${PN}.FPULockup-53804.patch
+	${FILESDIR}/${PN}.cmdlineLeak.patch"
 
 #============================================================================
 # We'll override the src_unpack() function from the eclass. This is necessary
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r13.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r14.ebuild
index e9b2507222bc..5694092ff0fa 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r13.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-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.9-r13.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r14.ebuild,v 1.1 2004/08/10 01:53:22 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -90,8 +90,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
-	epatch ${FILESDIR}/${PN}-4.9s.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${PN}-4.9s.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+	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!"
 
 	kernel_universal_unpack
 }