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

9 files changed, 41 insertions, 5 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index baff49dd6829..80d2361f35eb 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.45 2004/08/08 20:45:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.46 2004/08/10 00:38:11 plasmaroo Exp $
+
+*usermode-sources-2.4.24-r9 (10 Aug 2004)
+
+  10 Aug 2004; <plasmaroo@gentoo.org> -usermode-sources-2.4.24-r8.ebuild,
+  +usermode-sources-2.4.24-r9.ebuild, -usermode-sources-2.4.26-r5.ebuild,
+  +usermode-sources-2.4.26-r6.ebuild, -usermode-sources-2.6.6-r5.ebuild,
+  +usermode-sources-2.6.6-r6.ebuild,
+  +files/usermode-sources-2.4.cmdlineLeak.patch,
+  +files/usermode-sources-2.6.cmdlineLeak.patch:
+  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
 
 *usermode-sources-2.4.26-r5 (08 Aug 2004)
 
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r8 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r9
index ed8d13ee3405..ed8d13ee3405 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r8
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r9
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r5 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r6
index d4d898ba4b14..d4d898ba4b14 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r5
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r6
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r5 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r6
index 101ddaeed671..101ddaeed671 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r5
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r6
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.4.cmdlineLeak.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.4.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.4.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/usermode-sources/files/usermode-sources-2.6.cmdlineLeak.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.cmdlineLeak.patch
new file mode 100644
index 000000000000..763f0cf64449
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.cmdlineLeak.patch
@@ -0,0 +1,12 @@
+--- linux-2.6.7/fs/proc/base.c~	2004-08-05 10:35:04.411443536 +0200
++++ linux-2.6.7/fs/proc/base.c	2004-08-05 10:35:04.412443384 +0200
+@@ -330,6 +330,9 @@
+ 	if (!mm)
+ 		goto out;
+ 
++	if (!mm->arg_end)
++		goto out;
++	
+  	len = mm->arg_end - mm->arg_start;
+  
+ 	if (len > PAGE_SIZE)
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r8.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r9.ebuild
index f087c1d604bf..f7b60ebaecef 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r8.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.24-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/usermode-sources/usermode-sources-2.4.24-r8.ebuild,v 1.1 2004/08/08 20:45:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.24-r9.ebuild,v 1.1 2004/08/10 00:38:11 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r5.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r6.ebuild
index e1087b748103..eb491dd36ddb 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r5.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r6.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/usermode-sources/usermode-sources-2.4.26-r5.ebuild,v 1.1 2004/08/08 20:45:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r6.ebuild,v 1.1 2004/08/10 00:38:11 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -40,6 +40,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r5.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r6.ebuild
index 476dc61e4595..70080ea7f08e 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r5.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r6.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/usermode-sources/usermode-sources-2.6.6-r5.ebuild,v 1.1 2004/08/05 11:41:32 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r6.ebuild,v 1.1 2004/08/10 00:38:11 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -20,7 +20,8 @@ UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
 	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
 	${FILESDIR}/${P}.ProcPerms.patch
 	${FILESDIR}/${P}.CAN-2004-0495-0496.patch
-	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch"
+	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
+	${FILESDIR}/${PN}-2.6.cmdlineLeak.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2