closing #59905..

6 files changed, 32 insertions, 9 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index edfab707807f..d6ce484f7fde 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.61 2004/08/09 13:17:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.62 2004/08/10 07:10:34 voxus Exp $
+
+*openmosix-sources-2.4.24-r4 (10 Aug 2004)
+
+  10 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -openmosix-sources-2.4.24-r2,
+  +openmosix-sources-2.4.24-r4,
+  +files/cmdline-proc-fix.patch:
+  Security fix, closing bug #59905.
+  .24-r3 unmasked, .24-r4 is in ~x86 for now.
 
 *openmosix-sources-2.4.24-r3 (09 Aug 2004)
 
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 77efe6191250..109b2f5a911e 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,9 +1,8 @@
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 c0e04f714f2aae17e20c8b9561318499 openmosix-sources-2.4.27.ebuild 1330
-MD5 fe31bb3cc095c09247b2889d35d7ef87 ChangeLog 10985
-MD5 bc3019de90eedda3a28cf327c73e2a6b openmosix-sources-2.4.24-r2.ebuild 2542
-MD5 f9f80df169b97d9d340748a4985d863f openmosix-sources-2.4.24-r3.ebuild 2632
-MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r2 212
+MD5 3b1723fa20b27e0ba74b3a62ccce9d86 openmosix-sources-2.4.24-r3.ebuild 2631
+MD5 70195e8738d99c69473015a7ee2548c9 openmosix-sources-2.4.24-r4.ebuild 2706
+MD5 314ebaad8a99e1c5d7e52b041fdaa59f ChangeLog 11263
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
 MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
@@ -17,3 +16,5 @@ MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch
 MD5 7740aaeac2a0f4575703e11cc8920e91 files/digest-openmosix-sources-2.4.27 147
 MD5 60d25ff310fc6abfdce39ec9e47345af files/openmosix-sources.CAN-2004-0685.patch 2809
 MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r3 212
+MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
+MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r4 212
diff --git a/sys-kernel/openmosix-sources/files/cmdline-proc-fix.patch b/sys-kernel/openmosix-sources/files/cmdline-proc-fix.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/cmdline-proc-fix.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/openmosix-sources/files/digest-openmosix-sources-2.4.24-r2 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r4
index b75fe69b673a..b75fe69b673a 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r2
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r4
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r3.ebuild
index 39416b2adc91..980e26694a09 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r3.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r3.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/openmosix-sources/openmosix-sources-2.4.24-r3.ebuild,v 1.1 2004/08/09 13:17:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r3.ebuild,v 1.2 2004/08/10 07:10:34 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -28,7 +28,7 @@ PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r2.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild
index eba1a1bfddfe..2ff55176ea79 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r2.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.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/openmosix-sources/openmosix-sources-2.4.24-r2.ebuild,v 1.3 2004/08/09 13:17:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r4.ebuild,v 1.1 2004/08/10 07:10:34 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -28,7 +28,7 @@ PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 
 src_unpack() {
@@ -48,6 +48,8 @@ src_unpack() {
 	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0495.patch || die "Security patch failed"
 	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0497.patch || die "Security patch failed"
 	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0535.patch || die "Security patch failed"
+	epatch ${FILESDIR}/openmosix-sources.CAN-2004-0685.patch || die "Security patch failed"
+	epatch ${FILESDIR}/cmdline-proc-fix.patch || die "Security patch failed"
 
 	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add CAN-2004-0415"