Fixes #59905, cmdline security bug

5 files changed, 25 insertions, 5 deletions

diff --git a/sys-kernel/rsbac-dev-sources/ChangeLog b/sys-kernel/rsbac-dev-sources/ChangeLog
index 62b0ac42b902..899d7b0a7c31 100644
--- a/sys-kernel/rsbac-dev-sources/ChangeLog
+++ b/sys-kernel/rsbac-dev-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/rsbac-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.9 2004/08/05 01:44:37 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.10 2004/08/10 10:01:50 kang Exp $
+
+*rsbac-dev-sources-2.6.7-r5 (10 Aug 2004)
+
+  10 Aug 2004; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-dev-sources-2.6.7-r4.ebuild,
+  +rsbac-dev-sources-2.6.7-r5.ebuild:
+  Fixes #59905 - cmdline security bug
 
 *rsbac-dev-sources-2.6.7-r4 (05 Aug 2004)
 
diff --git a/sys-kernel/rsbac-dev-sources/Manifest b/sys-kernel/rsbac-dev-sources/Manifest
index 87ec45193041..ad23ac3bdc73 100644
--- a/sys-kernel/rsbac-dev-sources/Manifest
+++ b/sys-kernel/rsbac-dev-sources/Manifest
@@ -1,8 +1,9 @@
 MD5 fee9abc7797fef753c42454679bae9a7 metadata.xml 456
-MD5 26dcc385a147182bccc4b9215cd07f8c rsbac-dev-sources-2.6.7-r4.ebuild 1554
-MD5 d5d26591a5ec7223a12f97fa2b7ebaf3 ChangeLog 2657
+MD5 56ff3e024168afffdde71a8420b7cc6a rsbac-dev-sources-2.6.7-r5.ebuild 1588
+MD5 104e35b5988880349c8790288c154f2c ChangeLog 2869
 MD5 a869ab037c7e264df5f8e899864f08e9 files/rsbac-dev-sources-v1.2.3-3.patch 557
 MD5 6451bd210935a3978fd3a3edac673591 files/rsbac-dev-sources-iptables-dos.patch 389
 MD5 b6e38b41c8a79943df2ab2642149d06f files/rsbac-dev-sources-CAN-2004-0497.patch 2214
 MD5 f0e12ba218f53c2694a91259bdc2fdc7 files/rsbac-dev-sources-CAN-2004-0596.patch 494
-MD5 fd024d5229ee08ef90d6a532bdf99977 files/digest-rsbac-dev-sources-2.6.7-r4 281
+MD5 706d7794a822074aaf31502d7a7e48d3 files/2.6.7-cmdline.patch 455
+MD5 fd024d5229ee08ef90d6a532bdf99977 files/digest-rsbac-dev-sources-2.6.7-r5 281
diff --git a/sys-kernel/rsbac-dev-sources/files/2.6.7-cmdline.patch b/sys-kernel/rsbac-dev-sources/files/2.6.7-cmdline.patch
new file mode 100644
index 000000000000..3f0edd1b1af8
--- /dev/null
+++ b/sys-kernel/rsbac-dev-sources/files/2.6.7-cmdline.patch
@@ -0,0 +1,11 @@
+diff -puN fs/proc/base.c~proc_pid_cmdline-race-fix fs/proc/base.c
+--- 25/fs/proc/base.c~proc_pid_cmdline-race-fix	2004-08-05 11:28:21.915442360 -0700
++++ 25-akpm/fs/proc/base.c	2004-08-05 11:28:21.919441752 -0700
+@@ -340,6 +340,8 @@ static int proc_pid_cmdline(struct task_
+ 	struct mm_struct *mm = get_task_mm(task);
+ 	if (!mm)
+ 		goto out;
++	if (!mm->arg_end)
++		goto out;	/* Shh! No looking before we're done */
+ 
+  	len = mm->arg_end - mm->arg_start;
diff --git a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r4 b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r5
index 354ef30ca678..354ef30ca678 100644
--- a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r4
+++ b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r5
diff --git a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r5.ebuild
index e5331acbef3e..7daa7efae1b4 100644
--- a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild
+++ b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-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/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild,v 1.1 2004/08/05 01:44:37 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r5.ebuild,v 1.1 2004/08/10 10:01:50 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -20,6 +20,7 @@ UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="${FILESDIR}/${PN}-iptables-dos.patch
 	${FILESDIR}/${PN}-CAN-2004-0497.patch
 	${FILESDIR}/${PN}-CAN-2004-0596.patch
+	${FILESDIR}/${OKV}-cmdline.patch
 	${DISTDIR}/linux-2.6.7-CAN-2004-0415.patch
 	${DISTDIR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2
 	${FILESDIR}/${PN}-v1.2.3-3.patch"