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

4 files changed, 21 insertions, 2 deletions

diff --git a/sys-kernel/ia64-sources/ChangeLog b/sys-kernel/ia64-sources/ChangeLog
index 6bc668c8fa21..8f97afc6512d 100644
--- a/sys-kernel/ia64-sources/ChangeLog
+++ b/sys-kernel/ia64-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ia64-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.22 2004/08/08 18:58:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.23 2004/08/09 23:47:13 plasmaroo Exp $
+
+*ia64-sources-2.4.24-r10 (10 Aug 2004)
+
+  10 Aug 2004; <plasmaroo@gentoo.org> +ia64-sources-2.4.24-r10.ebuild,
+  -ia64-sources-2.4.24-r9.ebuild,
+  +files/ia64-sources-2.4.24.cmdlineLeak.patch:
+  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
 
 *ia64-sources-2.4.24-r9 (08 Aug 2004)
 
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r9 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r10
index 0c22f2fb2d27..0c22f2fb2d27 100644
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r9
+++ b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r10
diff --git a/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.cmdlineLeak.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.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/ia64-sources/ia64-sources-2.4.24-r9.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.24-r10.ebuild
index dcb88621fb61..d7808aa25fe2 100644
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r9.ebuild
+++ b/sys-kernel/ia64-sources/ia64-sources-2.4.24-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/ia64-sources/ia64-sources-2.4.24-r9.ebuild,v 1.1 2004/08/08 18:58:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ia64-sources-2.4.24-r10.ebuild,v 1.1 2004/08/09 23:47:13 plasmaroo Exp $
 
 IUSE=""
 
@@ -69,6 +69,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0565.patch || die "Failed to add the CAN-2004-0565 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+	epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 	kernel_universal_unpack
 }