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

8 files changed, 29 insertions, 7 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/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
 }