summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-kernel/usermode-sources/Manifest10
-rw-r--r--sys-kernel/usermode-sources/files/do_brk_fix.patch12
-rw-r--r--sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild5
-rw-r--r--sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild5
-rw-r--r--sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild5
-rw-r--r--sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild5
-rw-r--r--sys-kernel/vanilla-sources/ChangeLog7
-rw-r--r--sys-kernel/vanilla-sources/Manifest8
8 files changed, 43 insertions, 14 deletions
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 2a8baa7df91b..41b59ddfe892 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,8 +1,8 @@
-MD5 4626fc5506a32573ffa89487e5d20335 usermode-sources-2.4.21.ebuild 1513
-MD5 7e9d173cb48bdcc7715ca1e32208a841 usermode-sources-2.4.19-r51.ebuild 2003
-MD5 b9a84a67f41e39ecf9c3767267c8b71d usermode-sources-2.4.20-r1.ebuild 2002
-MD5 ff139acec0588accd7241cdd0563e508 usermode-sources-2.4.22.ebuild 1510
-MD5 fc587ce86540f376df3e5052584cec29 ChangeLog 2127
+MD5 6e67d00d17c56625e8a76974962bdb7f usermode-sources-2.4.21.ebuild 1510
+MD5 1fbb62fc260fe1b1a4beead10d179538 usermode-sources-2.4.19-r51.ebuild 2000
+MD5 66b88b1da882158e9cee3612d22f3586 usermode-sources-2.4.20-r1.ebuild 1999
+MD5 1ac67c30467b5afec141100006dbdbff usermode-sources-2.4.22.ebuild 1508
+MD5 d56df2dad04cdbc3479929a0a35b1019 ChangeLog 2356
MD5 6cdc1e33ed67ce129f7498203526cb16 metadata.xml 252
MD5 2b62c53b9695ab543819727b7e64e73b files/digest-usermode-sources-2.4.21 134
MD5 4c510db2fdca185ae68005e677b87dcd files/digest-usermode-sources-2.4.22 134
diff --git a/sys-kernel/usermode-sources/files/do_brk_fix.patch b/sys-kernel/usermode-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/do_brk_fix.patch
@@ -0,0 +1,12 @@
+--- a/mm/mmap.c Fri Sep 12 06:44:06 2003
++++ b/mm/mmap.c Thu Oct 2 01:18:19 2003
+@@ -1041,6 +1041,9 @@
+ if (!len)
+ return addr;
+
++ if ((addr + len) > TASK_SIZE || (addr + len) < addr)
++ return -EINVAL;
++
+ /*
+ * mlock MCL_FUTURE?
+ */
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild
index e43bcb0781e3..590ff4f346ac 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild,v 1.4 2003/09/29 18:44:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.19-r51.ebuild,v 1.5 2003/12/02 00:29:01 iggy Exp $
#OKV=original kernel version, KV=patched kernel version. They can be the same.
#we use this next variable to avoid duplicating stuff on cvs
@@ -39,6 +39,9 @@ src_unpack() {
mv linux-${OKV} linux-${KV} || die
cd ${S}
bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -d ${S} -p1
+
+ epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
echo "Preparing for compilation..."
#fix silly permissions in tarball
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild
index 8acebab59ede..e3bb5248ad0f 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild,v 1.4 2003/09/29 18:44:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.20-r1.ebuild,v 1.5 2003/12/02 00:29:01 iggy Exp $
#OKV=original kernel version, KV=patched kernel version. They can be the same.
#we use this next variable to avoid duplicating stuff on cvs
@@ -39,6 +39,9 @@ src_unpack() {
mv linux-${OKV} linux-${KV} || die
cd ${S}
bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -d ${S} -p1
+
+ epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
echo "Preparing for compilation..."
#fix silly permissions in tarball
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild
index 98a86d71ae07..6e182e7263a8 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild,v 1.4 2003/09/29 18:44:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.21.ebuild,v 1.5 2003/12/02 00:29:01 iggy Exp $
UML_VERSION="${PV}"
UML_PATCH="uml-patch-2.4.21-1"
@@ -31,6 +31,9 @@ src_unpack() {
fi
cd ${S}
bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -p1
+
+ epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
echo "Preparing for compilation..."
#fix silly permissions in tarball
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild
index 0465e04f69b3..335a0fa5f14a 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild,v 1.2 2003/10/31 13:45:58 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.22.ebuild,v 1.3 2003/12/02 00:29:01 iggy Exp $
UML_VERSION="${PV}"
UML_PATCH="uml-patch-2.4.22-5"
@@ -31,6 +31,9 @@ src_unpack() {
fi
cd ${S}
bzcat ${DISTDIR}/${UML_PATCH}.bz2 | patch -p1
+
+ epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
echo "Preparing for compilation..."
#fix silly permissions in tarball
diff --git a/sys-kernel/vanilla-sources/ChangeLog b/sys-kernel/vanilla-sources/ChangeLog
index c79c79657720..2426734e7bc3 100644
--- a/sys-kernel/vanilla-sources/ChangeLog
+++ b/sys-kernel/vanilla-sources/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-kernel/vanilla-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.16 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/ChangeLog,v 1.17 2003/12/02 00:32:24 iggy Exp $
+
+ 01 Dec 2003; Brian Jackson <iggy@gentoo.org> vanilla-sources-2.2.22.ebuild,
+ vanilla-sources-2.4.20.ebuild, vanilla-sources-2.4.21.ebuild,
+ vanilla-sources-2.4.22.ebuild, files/do_brk_fix.patch:
+ fix do_brk vuln
20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
vanilla-sources-2.4.20.ebuild, vanilla-sources-2.4.21.ebuild,
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 3b04c63e2a12..2027478a5175 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -1,9 +1,8 @@
MD5 0cf19cc3ec7138bf81eb7b6bb3353fb0 vanilla-sources-2.0.39.ebuild 2748
-MD5 cf04cbc2971910471f2612fbd93c3209 vanilla-sources-2.4.20.ebuild 794
-MD5 692751ea8f5d1466756a8fa9c7cd9637 vanilla-sources-2.4.22.ebuild 799
+MD5 a8318d8d47b7a6cb63a2f2a864c7243e vanilla-sources-2.4.20.ebuild 873
+MD5 9718d2d0cac5f5af32d75acaff8a47f5 vanilla-sources-2.4.22.ebuild 878
MD5 21a5e1ed5e13eb5399ec257020decf7f vanilla-sources-2.2.25.ebuild 2747
-MD5 88b20ff8dc6ae45d7e0be6932d9e0ee7 vanilla-sources-2.4.21.ebuild 799
-MD5 8cd9d3d154ad27b2c1e69cd16b32025b vanilla-sources-2.2.22.ebuild 2748
+MD5 d6cfde79f939fa5747a25b976d8bb3c3 vanilla-sources-2.4.21.ebuild 878
MD5 f11eb7c098f3b8f436398ec43ccd2d2e ChangeLog 2379
MD5 17ded3e049cc5ea4571a590f031fd463 metadata.xml 449
MD5 b3d6d116283caa91607762d0f5c22acd vanilla-sources-2.4.23.ebuild 794
@@ -14,3 +13,4 @@ MD5 bbc9b6e1761a30c6c7f7a9f8dec1e7e3 files/digest-vanilla-sources-2.4.20 67
MD5 9854e47afccae85e887bcb970fc68890 files/digest-vanilla-sources-2.4.21 67
MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-vanilla-sources-2.4.22 67
MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-vanilla-sources-2.4.23 67
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242