diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-18 23:31:44 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-18 23:31:44 +0000 |
| commit | 6c9fa1400bd99a465cdf8fed5d4ff8519fd2a36f (patch) | |
| tree | 4524065aadec81ab1cc3a1e10e156964d9d2a64c /sys-kernel/pac-sources | |
| parent | Issues most likley solved and marked ~sparc again (Manifest recommit) (diff) | |
| download | gentoo-2-6c9fa1400bd99a465cdf8fed5d4ff8519fd2a36f.tar.gz gentoo-2-6c9fa1400bd99a465cdf8fed5d4ff8519fd2a36f.tar.bz2 gentoo-2-6c9fa1400bd99a465cdf8fed5d4ff8519fd2a36f.zip | |
Added the patch for the mremap/munmap vulnerability. Bug #42024.
Diffstat (limited to 'sys-kernel/pac-sources')
| -rw-r--r-- | sys-kernel/pac-sources/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r3 (renamed from sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r2) | 0 | ||||
| -rw-r--r-- | sys-kernel/pac-sources/files/pac-sources.munmap.patch | 27 | ||||
| -rw-r--r-- | sys-kernel/pac-sources/pac-sources-2.4.23-r3.ebuild (renamed from sys-kernel/pac-sources/pac-sources-2.4.23-r2.ebuild) | 3 |
4 files changed, 38 insertions, 3 deletions
diff --git a/sys-kernel/pac-sources/ChangeLog b/sys-kernel/pac-sources/ChangeLog index b367a27ad8e6..614eb4dd33e3 100644 --- a/sys-kernel/pac-sources/ChangeLog +++ b/sys-kernel/pac-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/pac-sources -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pac-sources/ChangeLog,v 1.2 2004/01/06 23:25:03 plasmaroo Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pac-sources/ChangeLog,v 1.3 2004/02/18 23:31:44 plasmaroo Exp $ + +*pac-sources-2.4.23-r3 (18 Feb 2004) + + 18 Feb 2004; <plasmaroo@gentoo.org> pac-sources-2.4.23-r2.ebuild, + pac-sources-2.4.23-r3.ebuild, files/pac-sources.munmap.patch: + Added the patch for the mremap/munmap vulnerability. Bug #42024. + Removed old vulnerable release. *pac-sources-2.4.23-r2 (06 Jan 2004) diff --git a/sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r2 b/sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r3 index 75e05aae1086..75e05aae1086 100644 --- a/sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r2 +++ b/sys-kernel/pac-sources/files/digest-pac-sources-2.4.23-r3 diff --git a/sys-kernel/pac-sources/files/pac-sources.munmap.patch b/sys-kernel/pac-sources/files/pac-sources.munmap.patch new file mode 100644 index 000000000000..3c01b3447ec6 --- /dev/null +++ b/sys-kernel/pac-sources/files/pac-sources.munmap.patch @@ -0,0 +1,27 @@ +--- linux-2.4.20-openmosix-r8/mm/mremap.c~ 2004-02-18 22:33:57.000000000 +0000 ++++ linux-2.4.20-openmosix-r8/mm/mremap.c 2004-02-18 22:35:01.000000000 +0000 +@@ -266,7 +266,9 @@ + if ((addr <= new_addr) && (addr+old_len) > new_addr) + goto out; + +- do_munmap(current->mm, new_addr, new_len, 1); ++ ret = do_munmap(current->mm, new_addr, new_len); ++ if (ret && new_len) ++ goto out; + } + + /* +@@ -274,9 +276,11 @@ + * the unnecessary pages.. + * do_munmap does all the needed commit accounting + */ +- ret = addr; + if (old_len >= new_len) { +- do_munmap(current->mm, addr+new_len, old_len - new_len, 1); ++ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); ++ if (ret && old_len != new_len) ++ goto out; ++ ret = addr; + if (!(flags & MREMAP_FIXED) || (new_addr == addr)) + goto out; + } diff --git a/sys-kernel/pac-sources/pac-sources-2.4.23-r2.ebuild b/sys-kernel/pac-sources/pac-sources-2.4.23-r3.ebuild index b0b26304fafc..a6e5157cc50e 100644 --- a/sys-kernel/pac-sources/pac-sources-2.4.23-r2.ebuild +++ b/sys-kernel/pac-sources/pac-sources-2.4.23-r3.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/pac-sources/pac-sources-2.4.23-r2.ebuild,v 1.2 2004/01/08 21:43:19 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pac-sources/pac-sources-2.4.23-r3.ebuild,v 1.1 2004/02/18 23:31:44 plasmaroo Exp $ IUSE="build" @@ -60,6 +60,7 @@ src_unpack() { bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-pac patch failed" epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" + epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!" epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" kernel_universal_unpack |