7 files changed, 37 insertions, 3 deletions
diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 13ee7ca64018..2b935e8f8a2b 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.17 2004/08/08 20:27:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.18 2004/08/10 00:21:58 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r5 (10 Aug 2004)
+
+  10 Aug 2004; <plasmaroo@gentoo.org> -uclinux-sources-2.4.26_p0-r5.ebuild,
+  +uclinux-sources-2.4.26_p0-r6.ebuild, -uclinux-sources-2.6.7_p0-r4.ebuild,
+  +uclinux-sources-2.6.7_p0-r5.ebuild,
+  +files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch,
+  +files/uclinux-sources-2.6.cmdlineLeak.patch:
+  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
 
 *uclinux-sources-2.4.26_p0-r5 (08 Aug 2004)
 
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r5 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r6
index 756581fa999d..756581fa999d 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r5
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r6
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r5
index 2f8ad3b4942c..2f8ad3b4942c 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r5
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.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/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch
new file mode 100644
index 000000000000..763f0cf64449
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-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/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.ebuild
index 37a0a687d8ca..6cf8c054eba1 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-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/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild,v 1.1 2004/08/08 20:27:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.ebuild,v 1.1 2004/08/10 00:21:58 plasmaroo Exp $
 
 IUSE=""
 
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 
 	kernel_universal_unpack
 	set ARCH=${MY_ARCH}
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.ebuild
index e5c1a7aea97c..3d8674d5f61b 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.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/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild,v 1.1 2004/08/05 11:15:48 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.ebuild,v 1.1 2004/08/10 00:21:58 plasmaroo Exp $
 
 IUSE=""
 
@@ -45,6 +45,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch || die "Failed to apply the CAN-2004-0596 security patch!"
 	epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!"
 	epatch ${FILESDIR}/${PN}-2.6.ProcPerms.patch || die "Failed to apply the /proc permissions security patch!"
+	epatch ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 
 	set MY_ARCH=${ARCH}
 	unset ARCH