diff options
author | Tim Yamin <plasmaroo@gentoo.org> | 2004-01-06 21:58:45 +0000 |
---|---|---|
committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-01-06 21:58:45 +0000 |
commit | 1e58186af38dffd56b9acf2b480318e42f20a9a4 (patch) | |
tree | 5bb1f9e95ab7ff6fe9f8e0f80eaf079cab34dc9c /sys-kernel/mm-sources | |
parent | Added patches to address the security vulnerabilities in bugs #37292 and #37317. (diff) | |
download | historical-1e58186af38dffd56b9acf2b480318e42f20a9a4.tar.gz historical-1e58186af38dffd56b9acf2b480318e42f20a9a4.tar.bz2 historical-1e58186af38dffd56b9acf2b480318e42f20a9a4.zip |
Added patches to address the security vulnerabilities in bugs #37292 and #37317.
Diffstat (limited to 'sys-kernel/mm-sources')
-rw-r--r-- | sys-kernel/mm-sources/ChangeLog | 8 | ||||
-rw-r--r-- | sys-kernel/mm-sources/Manifest | 11 | ||||
-rw-r--r-- | sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch | 13 | ||||
-rw-r--r-- | sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild | 14 | ||||
-rw-r--r-- | sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild | 3 | ||||
-rw-r--r-- | sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild | 3 | ||||
-rw-r--r-- | sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild | 3 |
7 files changed, 38 insertions, 17 deletions
diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog index d016623d58ae..f323ebb5baa8 100644 --- a/sys-kernel/mm-sources/ChangeLog +++ b/sys-kernel/mm-sources/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/mm-sources # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.104 2004/01/05 21:31:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.105 2004/01/06 21:58:31 plasmaroo Exp $ + + 06 Jan 2004; <plasmaroo@gentoo.org> mm-sources-2.6.0-r1.ebuild, + mm-sources-2.6.0-r2.ebuild, mm-sources-2.6.1_rc1-r1.ebuild, + mm-sources-2.6.1_rc1-r2.ebuild, files/mm-sources.CAN-2003-0985.patch: + Added patches to address the security vulnerabilities in bugs #37292 and + #37317. 05 Jan 2004; <plasmaroo@gentoo.org> mm-sources-2.6.1_rc1-r2.ebuild: Version bump. diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest index 291ef7efc5ab..31c60b3e53fc 100644 --- a/sys-kernel/mm-sources/Manifest +++ b/sys-kernel/mm-sources/Manifest @@ -1,12 +1,13 @@ -MD5 f0f8d6115b7bfd9e35ac4e19d6d35207 ChangeLog 17825 -MD5 cc71764b6f551f7875b416e07ef4b9a5 mm-sources-2.6.1_rc1-r2.ebuild 3014 +MD5 897dfd64b1fc570de749036467d3a178 ChangeLog 18111 +MD5 ae110e9ccd592ef63c2b64747497fe58 mm-sources-2.6.1_rc1-r2.ebuild 3109 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351 -MD5 4581f789eb724ea67cc5521f64efe282 mm-sources-2.6.1_rc1-r1.ebuild 3014 -MD5 c99ef4fc00b590da7296d8e5a22c21a2 mm-sources-2.6.0-r1.ebuild 2992 -MD5 29b1283c035365d2a544935f2afbcfd5 mm-sources-2.6.0-r2.ebuild 2988 +MD5 cd95d73b738b813a5687a2293f305e50 mm-sources-2.6.1_rc1-r1.ebuild 3109 +MD5 0f54ce5cb4a50a097e478bd6246a26e3 mm-sources-2.6.0-r1.ebuild 2927 +MD5 aef6bc5c4f5ceef23a32b6b0fb21443b mm-sources-2.6.0-r2.ebuild 3083 MD5 1ad49f2d7d99c775522b3e7b06f4e9de files/digest-mm-sources-2.6.0-r2 125 MD5 b5da5c743790e47591d9ae0dfd9ba795 files/digest-mm-sources-2.6.1_rc1-r1 192 MD5 01a838b34918f69ee08e3674c2b3c6e7 files/digest-mm-sources-2.6.0-r1 124 MD5 c57fb303f389d1b448d8c5ffa004b58f files/apic.patch 533 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751 MD5 d2ae620ce6ed9a0dc5b6a268b0380499 files/digest-mm-sources-2.6.1_rc1-r2 192 +MD5 05f3097edb6fd323d0ddf083fb25f838 files/mm-sources.CAN-2003-0985.patch 414 diff --git a/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch b/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch new file mode 100644 index 000000000000..eb1c9d26b3d5 --- /dev/null +++ b/sys-kernel/mm-sources/files/mm-sources.CAN-2003-0985.patch @@ -0,0 +1,13 @@ +--- linux/mm/mremap.c.orig 2004-01-05 17:01:21.382104120 +0000 ++++ linux/mm/mremap.c 2004-01-05 17:15:25.689749848 +0000 +@@ -270,6 +270,10 @@ + old_len = PAGE_ALIGN(old_len); + new_len = PAGE_ALIGN(new_len); + ++ /* Don't allow the degenerate cases */ ++ if (!(old_len | new_len)) ++ goto out; ++ + /* new_addr is only valid if MREMAP_FIXED is specified */ + if (flags & MREMAP_FIXED) { + if (new_addr & ~PAGE_MASK) diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild index bbdce42fc24b..6b293d14a132 100644 --- a/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild +++ b/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild,v 1.2 2004/01/02 23:34:06 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r1.ebuild,v 1.3 2004/01/06 21:58:32 plasmaroo Exp $ #OKV=original kernel version, KV=patched kernel version. They can be the same. ETYPE="sources" @@ -38,6 +38,7 @@ src_unpack() { mv linux-${OKV} linux-${KV} cd ${S} bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed" + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" find . -iname "*~" | xargs rm 2> /dev/null # Gentoo Linux uses /boot, so fix 'make install' to work properly @@ -54,18 +55,15 @@ src_unpack() { && mv Makefile.new Makefile cd ${S} - #This is needed on > 2.5 + # This is needed on > 2.5 MY_ARCH=${ARCH} unset ARCH - #sometimes we have icky kernel symbols; this seems to get rid of them + + # Sometimes we have icky kernel symbols; this seems to get rid of them make mrproper || die "make mrproper died" ARCH=${MY_ARCH} - - # kernel_universal_unpack used to do this... changes in kconfig make - # this die now - #make include/linux/version.h || die "make include/linux/version.h failed" - } + pkg_postinst() { if [ ! -e ${ROOT}usr/src/linux-beta ] then diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild index 9d1a19e2576b..a04a767a6556 100644 --- a/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild +++ b/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild,v 1.2 2004/01/02 23:34:06 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0-r2.ebuild,v 1.3 2004/01/06 21:58:32 plasmaroo Exp $ #OKV=original kernel version, KV=patched kernel version. They can be the same. ETYPE="sources" @@ -38,6 +38,7 @@ src_unpack() { mv linux-${OKV} linux-${KV} cd ${S} bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed" + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" find . -iname "*~" | xargs rm 2> /dev/null # Gentoo Linux uses /boot, so fix 'make install' to work properly diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild index 050b33168cfc..75d50676f5b8 100644 --- a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild +++ b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild,v 1.3 2004/01/05 21:31:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r1.ebuild,v 1.4 2004/01/06 21:58:32 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. ETYPE="sources" @@ -41,6 +41,7 @@ src_unpack() { cd ${S} bzcat ${DISTDIR}/patch-${PKV}.bz2 | patch -p1 || die "2.6.1-rc1 patch failed!" bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed" + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" find . -iname "*~" | xargs rm 2> /dev/null # Gentoo Linux uses /boot, so fix 'make install' to work properly diff --git a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild index 339bca838fcb..2c4b44488c00 100644 --- a/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild +++ b/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild,v 1.1 2004/01/05 21:31:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.1_rc1-r2.ebuild,v 1.2 2004/01/06 21:58:32 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. ETYPE="sources" @@ -41,6 +41,7 @@ src_unpack() { cd ${S} bzcat ${DISTDIR}/patch-${PKV}.bz2 | patch -p1 || die "2.6.1-rc1 patch failed!" bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed" + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" find . -iname "*~" | xargs rm 2> /dev/null # Gentoo Linux uses /boot, so fix 'make install' to work properly |