summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Jackson <iggy@gentoo.org>2003-12-02 04:13:50 +0000
committerBrian Jackson <iggy@gentoo.org>2003-12-02 04:13:50 +0000
commit81ce9e6e330f096a743810c61aa3456297cf6d57 (patch)
tree24dd72ade3c515e20fd87f049ef022649327caf0 /sys-kernel/rsbac-sources
parentfix do_brk vuln (diff)
downloadgentoo-2-81ce9e6e330f096a743810c61aa3456297cf6d57.tar.gz
gentoo-2-81ce9e6e330f096a743810c61aa3456297cf6d57.tar.bz2
gentoo-2-81ce9e6e330f096a743810c61aa3456297cf6d57.zip
fix do_brk vuln
Diffstat (limited to 'sys-kernel/rsbac-sources')
-rw-r--r--sys-kernel/rsbac-sources/ChangeLog6
-rw-r--r--sys-kernel/rsbac-sources/Manifest5
-rw-r--r--sys-kernel/rsbac-sources/files/do_brk_fix.patch12
-rw-r--r--sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild4
4 files changed, 23 insertions, 4 deletions
diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index 7551c6e90310..f4ba410a09a5 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/rsbac-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.2 2003/02/12 09:18:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.3 2003/12/02 04:11:38 iggy Exp $
+
+ 01 Dec 2003; Brian Jackson <iggy@gentoo.org> rsbac-sources-2.4.20.ebuild,
+ files/do_brk_fix.patch:
+ fix do_brk vuln
*rsbac-sources-2.4.20 (7 Feb 2003)
diff --git a/sys-kernel/rsbac-sources/Manifest b/sys-kernel/rsbac-sources/Manifest
index 22f75d8f2f0b..2280849f7ef1 100644
--- a/sys-kernel/rsbac-sources/Manifest
+++ b/sys-kernel/rsbac-sources/Manifest
@@ -1,4 +1,5 @@
-MD5 8be41a400c85308907cdc3a2bca16558 ChangeLog 370
-MD5 f6508f74cb813ae3dc696d29f7ecf0d1 rsbac-sources-2.4.20.ebuild 3097
+MD5 d3af31420ef5d60389143c9043b6d4f1 rsbac-sources-2.4.20.ebuild 3177
+MD5 7801aeb4a15b36c8f30a64f8986b21d9 ChangeLog 489
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
MD5 79053afe39299a3f4c205204dd0b5e49 files/digest-rsbac-sources-2.4.20 403
MD5 e7532d3b86be69c91d6530663358559c files/nr_rsbac_patch.diff 295
diff --git a/sys-kernel/rsbac-sources/files/do_brk_fix.patch b/sys-kernel/rsbac-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/rsbac-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/rsbac-sources/rsbac-sources-2.4.20.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild
index 8d175cb19917..101450472328 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.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/rsbac-sources/rsbac-sources-2.4.20.ebuild,v 1.6 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild,v 1.7 2003/12/02 04:11:38 iggy Exp $
ETYPE="sources"
@@ -60,6 +60,8 @@ src_unpack() {
patch -p1 < ${BUGFIX}-3.diff || die "cannot apply fix patch 1"
echo "-> Fix patch 3 applied"
+ epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
# We need to have our kernel in /boot
mv Makefile Makefile.orig
sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \