summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-02-18 18:07:50 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-02-18 18:07:50 +0000
commitd9aeac6a9654ab935ccba8e87cfe0942454ae51b (patch)
tree143956d203069af0f3c355b2d35075642e9d84b0 /sys-kernel/alpha-sources/files
parentadded ~amd64 keyword. (Manifest recommit) (diff)
downloadgentoo-2-d9aeac6a9654ab935ccba8e87cfe0942454ae51b.tar.gz
gentoo-2-d9aeac6a9654ab935ccba8e87cfe0942454ae51b.tar.bz2
gentoo-2-d9aeac6a9654ab935ccba8e87cfe0942454ae51b.zip
Added the patch for the mremap/munmap vulnerability. Bug #42024.
Diffstat (limited to 'sys-kernel/alpha-sources/files')
-rw-r--r--sys-kernel/alpha-sources/files/alpha-sources.munmap.patch27
-rw-r--r--sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r42
2 files changed, 29 insertions, 0 deletions
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.munmap.patch b/sys-kernel/alpha-sources/files/alpha-sources.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-sources.munmap.patch
@@ -0,0 +1,27 @@
+diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
+--- linux-2.4.25-rc3/mm/mremap.c 2004-02-18 13:56:01.000000000 +0000
++++ linux-2.4.25-rc4/mm/mremap.c 2004-02-18 13:49:08.000000000 +0000
+@@ -258,16 +258,20 @@
+ if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ goto out;
+
+- do_munmap(current->mm, new_addr, new_len);
++ ret = do_munmap(current->mm, new_addr, new_len);
++ if (ret && new_len)
++ goto out;
+ }
+
+ /*
+ * Always allow a shrinking remap: that just unmaps
+ * the unnecessary pages..
+ */
+- ret = addr;
+ if (old_len >= new_len) {
+- do_munmap(current->mm, addr+new_len, old_len - new_len);
++ 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/alpha-sources/files/digest-alpha-sources-2.4.21-r4 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4
new file mode 100644
index 000000000000..a17dcc489c19
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r4
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r3.tar.bz2 1696825