Fixed race condition in /proc/<pid>/cmdline (#59905).

4 files changed, 34 insertions, 4 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index d1d0de14f856..f3d29ec5f1b3 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.42 2004/08/09 22:50:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.43 2004/08/09 23:24:56 gmsoft Exp $
+
+  09 Aug 2004; Guy Martin <gmsoft@gentoo.org>
+  +files/security-proc-cmdline.patch, hppa-sources-2.4.26_p7-r1.ebuild:
+  Fixed race condition in /proc/<pid>/cmdline (#59905).
 
 *hppa-sources-2.4.26_p7-r1 (09 Aug 2004)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index bc0f3e4e066a..a2406d910ec3 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
-MD5 8e8477678db59b9689a87f69698b8ea6 ChangeLog 7297
+MD5 928282cf4a7e64fcd4ac3fe8a4f13102 ChangeLog 7472
 MD5 502f3aee4aee214f710d0de28f255fa2 hppa-sources-2.4.26_p6-r1.ebuild 2294
 MD5 ac36567dfb23d8bd364cbdb41d0a7b88 hppa-sources-2.4.26_p7.ebuild 2470
-MD5 9665fc70a6778782551a36fad28671ce hppa-sources-2.4.26_p7-r1.ebuild 2673
+MD5 a77f4d3e69268faffc1b09bb4e4d3d7e hppa-sources-2.4.26_p7-r1.ebuild 2788
 MD5 d4a740ae56c2049247083af387a22a85 files/CAN-2004-0394.patch 350
 MD5 0f66013f643c79c97fda489618a4e2fd files/CAN-2004-0535-2.4-e1000.patch 476
 MD5 dc18e982f8149588a291956481885a8c files/CAN-2004-0495-2.4-sparse.patch 17549
@@ -11,3 +11,4 @@ MD5 ff11f350435d0871b62d2f7a62bc463c files/digest-hppa-sources-2.4.26_p6-r1 224
 MD5 cf38cb04fc6f56768ff1fce46e5da41c files/digest-hppa-sources-2.4.26_p7 302
 MD5 60d25ff310fc6abfdce39ec9e47345af files/CAN-2004-685.patch 2809
 MD5 fac8b9be67d8fe295b751bbf2b6c608c files/digest-hppa-sources-2.4.26_p7-r1 378
+MD5 222e890035f4ad3152f0c2a625a9ea67 files/security-proc-cmdline.patch 693
diff --git a/sys-kernel/hppa-sources/files/security-proc-cmdline.patch b/sys-kernel/hppa-sources/files/security-proc-cmdline.patch
new file mode 100644
index 000000000000..bb80884c394e
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/security-proc-cmdline.patch
@@ -0,0 +1,24 @@
+
+From: Roger Luethi <rl@hellgate.ch>
+
+If you win the race with a starting process, you can read its environment.
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+---
+
+ 25-akpm/fs/proc/base.c |    2 ++
+ 1 files changed, 2 insertions(+)
+
+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/hppa-sources/hppa-sources-2.4.26_p7-r1.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p7-r1.ebuild
index f43ad0af245b..7ebdbadffe51 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p7-r1.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p7-r1.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/hppa-sources/hppa-sources-2.4.26_p7-r1.ebuild,v 1.1 2004/08/09 22:50:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.26_p7-r1.ebuild,v 1.2 2004/08/09 23:24:56 gmsoft Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -58,6 +58,7 @@ src_unpack() {
 	epatch ${FILESDIR}/CAN-2004-0535-2.4-e1000.patch || die "Failed to patch CAN-2004-0535 security fix!"
 	epatch ${FILESDIR}/CAN-2004-0497.patch || die "Failed to patch CAN-2004-0497 security fix!"
 	epatch ${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch || die "Failed to patch CAN-2004-0415 security fix!"
+	epatch ${FILESDIR}/security-proc-cmdline.patch || die "Failed to patch security-proc-cmdline.patch security fix!"
 
 	kernel_universal_unpack
 }