summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-08-10 00:21:58 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-08-10 00:21:58 +0000
commit4b76ea9e41d00ad28ff46e3758c5efb101936c2a (patch)
tree894b7ee1391c79f2ceb94b300b06873191ff4b85 /sys-kernel/uclinux-sources
parentversion bump. committing directly to stable on x86 to fix 59895 (diff)
downloadhistorical-4b76ea9e41d00ad28ff46e3758c5efb101936c2a.tar.gz
historical-4b76ea9e41d00ad28ff46e3758c5efb101936c2a.tar.bz2
historical-4b76ea9e41d00ad28ff46e3758c5efb101936c2a.zip
Version bump for the /proc/cmdline leak vulnerability; bug #59905.
Diffstat (limited to 'sys-kernel/uclinux-sources')
-rw-r--r--sys-kernel/uclinux-sources/ChangeLog11
-rw-r--r--sys-kernel/uclinux-sources/Manifest12
-rw-r--r--sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r6 (renamed from sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r5)0
-rw-r--r--sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r5 (renamed from sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4)0
-rw-r--r--sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch11
-rw-r--r--sys-kernel/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch12
-rw-r--r--sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.ebuild (renamed from sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild)3
-rw-r--r--sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.ebuild (renamed from sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild)3
8 files changed, 44 insertions, 8 deletions
diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 13ee7ca64018..2b935e8f8a2b 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sys-kernel/uclinux-sources
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.17 2004/08/08 20:27:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.18 2004/08/10 00:21:58 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r5 (10 Aug 2004)
+
+ 10 Aug 2004; <plasmaroo@gentoo.org> -uclinux-sources-2.4.26_p0-r5.ebuild,
+ +uclinux-sources-2.4.26_p0-r6.ebuild, -uclinux-sources-2.6.7_p0-r4.ebuild,
+ +uclinux-sources-2.6.7_p0-r5.ebuild,
+ +files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch,
+ +files/uclinux-sources-2.6.cmdlineLeak.patch:
+ Version bump for the /proc/cmdline leak vulnerability; bug #59905.
*uclinux-sources-2.4.26_p0-r5 (08 Aug 2004)
diff --git a/sys-kernel/uclinux-sources/Manifest b/sys-kernel/uclinux-sources/Manifest
index f9390aa1a694..7a3f7a9f365a 100644
--- a/sys-kernel/uclinux-sources/Manifest
+++ b/sys-kernel/uclinux-sources/Manifest
@@ -1,15 +1,17 @@
-MD5 1d42c0dd1fbd85fa39c19c60bb76bdc9 ChangeLog 4716
-MD5 700bd4369aad038b4175e9e8fa100f38 uclinux-sources-2.4.26_p0-r5.ebuild 2021
+MD5 128ce9667c6adead71700c5f6d098f94 ChangeLog 5124
MD5 f3fa6c474b8727f8215534b7fc9c93ba metadata.xml 304
-MD5 1f5de08f653a9c02ad677bb808cd67c3 uclinux-sources-2.6.7_p0-r4.ebuild 1875
+MD5 aa64086b97b9042bea8cf8cca8da487b uclinux-sources-2.6.7_p0-r5.ebuild 1973
+MD5 6338c28a13241723e68a16b683b1ee85 uclinux-sources-2.4.26_p0-r6.ebuild 2114
MD5 dc18e982f8149588a291956481885a8c files/uclinux-sources-2.4.26_p0.CAN-2004-0495.patch 17549
+MD5 c2510fe1891f5a9effb12c2196922206 files/uclinux-sources-2.6.cmdlineLeak.patch 281
MD5 60d25ff310fc6abfdce39ec9e47345af files/uclinux-sources-2.4.26_p0.CAN-2004-0685.patch 2809
MD5 d4a740ae56c2049247083af387a22a85 files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch 350
+MD5 68a561b1216380268e96d2fcea905cd2 files/digest-uclinux-sources-2.4.26_p0-r6 225
MD5 0f66013f643c79c97fda489618a4e2fd files/uclinux-sources-2.4.26_p0.CAN-2004-0535.patch 476
MD5 95708646470a95668e8789cd415844ed files/uclinux-sources.CAN-2004-0497.patch 846
MD5 c9da1bc82b906f6abc648c056e7bf662 files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch 354
-MD5 68a561b1216380268e96d2fcea905cd2 files/digest-uclinux-sources-2.4.26_p0-r5 225
+MD5 c72fc64f2fd878daf2c62d998239c803 files/digest-uclinux-sources-2.6.7_p0-r5 211
MD5 39361f8d16b1fe5891aab62e92f8cd30 files/uclinux-sources-2.6.IPTables-RDoS.patch 390
MD5 b738cb0120a32aa92cfcfdbd564dd21f files/uclinux-sources-2.6.ProcPerms.patch 1368
MD5 8204afea1d572b49a4a80d8da4eef0c9 files/uclinux-sources-2.6.CAN-2004-0596.patch 1033
-MD5 c72fc64f2fd878daf2c62d998239c803 files/digest-uclinux-sources-2.6.7_p0-r4 211
+MD5 d1ccc2047be533c992f67270a150a210 files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch 388
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r5 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r6
index 756581fa999d..756581fa999d 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r5
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r6
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r5
index 2f8ad3b4942c..2f8ad3b4942c 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r5
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.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/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch
new file mode 100644
index 000000000000..763f0cf64449
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.cmdlineLeak.patch
@@ -0,0 +1,12 @@
+--- linux-2.6.7/fs/proc/base.c~ 2004-08-05 10:35:04.411443536 +0200
++++ linux-2.6.7/fs/proc/base.c 2004-08-05 10:35:04.412443384 +0200
+@@ -330,6 +330,9 @@
+ if (!mm)
+ goto out;
+
++ if (!mm->arg_end)
++ goto out;
++
+ len = mm->arg_end - mm->arg_start;
+
+ if (len > PAGE_SIZE)
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.ebuild
index 37a0a687d8ca..6cf8c054eba1 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.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/uclinux-sources/uclinux-sources-2.4.26_p0-r5.ebuild,v 1.1 2004/08/08 20:27:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r6.ebuild,v 1.1 2004/08/10 00:21:58 plasmaroo Exp $
IUSE=""
@@ -53,6 +53,7 @@ src_unpack() {
epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+ epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
kernel_universal_unpack
set ARCH=${MY_ARCH}
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.ebuild
index e5c1a7aea97c..3d8674d5f61b 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-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/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild,v 1.1 2004/08/05 11:15:48 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r5.ebuild,v 1.1 2004/08/10 00:21:58 plasmaroo Exp $
IUSE=""
@@ -45,6 +45,7 @@ src_unpack() {
epatch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch || die "Failed to apply the CAN-2004-0596 security patch!"
epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!"
epatch ${FILESDIR}/${PN}-2.6.ProcPerms.patch || die "Failed to apply the /proc permissions security patch!"
+ epatch ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
set MY_ARCH=${ARCH}
unset ARCH