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

12 files changed, 41 insertions, 14 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 384da25a39f6..2e3191e1810b 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.86 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.87 2004/08/14 14:35:32 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r25 (14 Aug 2004)
+
+  14 Aug 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.19-r21.ebuild,
+  +gentoo-sources-2.4.19-r22.ebuild, -gentoo-sources-2.4.20-r24.ebuild,
+  +gentoo-sources-2.4.20-r25.ebuild, -gentoo-sources-2.4.22-r15.ebuild,
+  +gentoo-sources-2.4.22-r16.ebuild, -gentoo-sources-2.4.25-r8.ebuild,
+  +gentoo-sources-2.4.25-r9.ebuild, -gentoo-sources-2.4.26-r8.ebuild,
+  +gentoo-sources-2.4.26-r9.ebuild,
+  +files/gentoo-sources-2.4.cmdlineLeak.patch:
+  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
 
 *gentoo-sources-2.4.25-r8 (08 Aug 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r21 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r22
index b708cb670aa9..b708cb670aa9 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r21
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r22
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r24 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r25
index 3cf440f6d20e..3cf440f6d20e 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r24
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r25
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r15 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r16
index 9ee5ce3b934c..9ee5ce3b934c 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r15
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r16
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r8 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r9
index 4e797f96694e..4e797f96694e 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r8
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r9
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r8 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r9
index 925972bf56cc..925972bf56cc 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r8
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r9
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.cmdlineLeak.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/gentoo-sources-2.4.19-r21.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r22.ebuild
index 04c8d3d36ee1..fa10a9b03321 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r21.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r22.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/gentoo-sources/gentoo-sources-2.4.19-r21.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r22.ebuild,v 1.1 2004/08/14 14:35:32 plasmaroo Exp $
 
 IUSE="acpi4linux crypt xfs"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/-r21/-r10}.tar.bz2
+	 http://gentoo.lostlogicx.com/patches-${KV/-r22/-r10}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
@@ -44,7 +44,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/-r21/-r10}
+	cd ${KV/-r22/-r10}
 	# Kill patches we aren't suppposed to use, don't worry about
 	# failures, if they aren't there that is a good thing!
 
@@ -89,4 +89,5 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.20-CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r25.ebuild
index 451c95557887..495c8f2859d9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r24.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r25.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/gentoo-sources/gentoo-sources-2.4.20-r24.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r25.ebuild,v 1.1 2004/08/14 14:35:32 plasmaroo Exp $
 
 IUSE="aavm crypt evms2 usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r24/r14}.tar.bz2
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r25/r14}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/gentoo-sources-${OKV}-CAN-2004-0415.patch"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/r24/r14}
+	cd ${WORKDIR}/${KV/r25/r14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -145,6 +145,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r16.ebuild
index d4a78be21b43..985cd0d8b09c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r15.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r16.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/gentoo-sources/gentoo-sources-2.4.22-r15.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r16.ebuild,v 1.1 2004/08/14 14:35:32 plasmaroo Exp $
 
 ETYPE="sources"
 
@@ -25,13 +25,14 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/gentoo-sources-${PVR/15/5}.patch.bz2"
+	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
+	${DISTDIR}/gentoo-sources-${PVR/16/5}.patch.bz2"
 
 S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/15/5}.patch.bz2
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/16/5}.patch.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 KEYWORDS="x86 -*"
 IUSE=""
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r9.ebuild
index 699b7c6fb89d..e7ee4a070357 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r8.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r9.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/gentoo-sources/gentoo-sources-2.4.25-r8.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r9.ebuild,v 1.1 2004/08/14 14:35:32 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -21,6 +21,7 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
+	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch
 	${DISTDIR}/${P}.patch.bz2"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r9.ebuild
index d26a045c3e59..ab071906bc66 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r8.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r9.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/gentoo-sources/gentoo-sources-2.4.26-r8.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r9.ebuild,v 1.1 2004/08/14 14:35:32 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -14,9 +14,10 @@ UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
 	${FILESDIR}/${P}-OpenSWAN-CompileFix.patch
+	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
-	${DISTDIR}/${PF/r8/r6}.tar.bz2"
+	${DISTDIR}/${PF/r9/r6}.tar.bz2"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r8/r6}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r9/r6}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"