r3416 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series
Simon Horman
horms@costa.debian.org
Fri, 01 Jul 2005 08:55:31 +0000
Author: horms
Date: 2005-07-01 08:55:31 +0000 (Fri, 01 Jul 2005)
New Revision: 3416
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/mm-mmap-range-test.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
Backported mm-mmap-range-test.dpatch to 2.6.8
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-06-30 12:25:25 UTC (rev 3415)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-07-01 08:55:31 UTC (rev 3416)
@@ -63,15 +63,11 @@
lists if we don't retry after writing something to disk.
(Simon Horman)
- # Ommitted as it seems to require an update to struct_mm, which
- # would be an ABI change. As it stands it breaks the build.
- # Looking for a better solution, according to Frederik Schueler
- # he has one from Ubuntu. More anon
- #* [SECURITY] mm-mmap-range-test.dpatch
- # Make sure get_unmapped_area sanity tests are done regardless of
- # wheater MAP_FIXED is set or not.
- # See CAN-2005-1265
- # (Simon Horman)
+ * [SECURITY] mm-mmap-range-test.dpatch
+ Make sure get_unmapped_area sanity tests are done regardless of
+ wheater MAP_FIXED is set or not.
+ See CAN-2005-1265
+ (Simon Horman)
* mm-rmap-out-of-bounds-pte.dpatch
Stop try_to_unmap_cluster() passing out-of-bounds pte to pte_unmap()
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/mm-mmap-range-test.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/mm-mmap-range-test.dpatch 2005-06-30 12:25:25 UTC (rev 3415)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/mm-mmap-range-test.dpatch 2005-07-01 08:55:31 UTC (rev 3416)
@@ -24,7 +24,8 @@
D: Deleted Manually deleted by subsequent user edit
R: Revised Manually revised by subsequent user edit
-Manually applied and rediffed for 2.6.8
+Manually applied and rediffed for 2.6.8 and backported use of
+current->mm->get_unmapped_area() to arch_get_unmapped_area() -- Horms
--- a/include/linux/err.h 2005-06-28 14:37:41.000000000 +0900
+++ b/include/linux/err.h 2005-06-28 14:37:44.000000000 +0900
@@ -80,7 +81,7 @@
+ if (!(flags & MAP_FIXED)) {
+ unsigned long (*get_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+
-+ get_area = current->mm->get_unmapped_area;
++ get_area = arch_get_unmapped_area;
+ if (file && file->f_op && file->f_op->get_unmapped_area)
+ get_area = file->f_op->get_unmapped_area;
+ addr = get_area(file, addr, len, pgoff, flags);
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17 2005-06-30 12:25:25 UTC (rev 3415)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17 2005-07-01 08:55:31 UTC (rev 3416)
@@ -12,7 +12,7 @@
+ fs-exec-posix-timers-leak-2.dpatch
+ fs-hfs-oops-and-leak.dpatch
+ fs-jbd-checkpoint-assertion.dpatch
-#+ mm-mmap-range-test.dpatch
++ mm-mmap-range-test.dpatch
+ mm-rmap-out-of-bounds-pte.dpatch
+ net-bridge-netfilter-etables-smp-race.dpatch
+ net-bridge-mangle-oops-1.dpatch