[Glibc-bsd-commits] r5375 - in branches/wheezy/kfreebsd-9/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-22 21:59:49 +0000 (Wed, 22 Jan 2014)
New Revision: 5375

Added:
   branches/wheezy/kfreebsd-9/debian/patches/EN-14_02.mmap.patch
Modified:
   branches/wheezy/kfreebsd-9/debian/changelog
   branches/wheezy/kfreebsd-9/debian/patches/series
Log:
Apply upstream EN-14_02.mmap patch.

Modified: branches/wheezy/kfreebsd-9/debian/changelog
===================================================================
--- branches/wheezy/kfreebsd-9/debian/changelog	2014-01-21 11:58:54 UTC (rev 5374)
+++ branches/wheezy/kfreebsd-9/debian/changelog	2014-01-22 21:59:49 UTC (rev 5375)
@@ -3,6 +3,7 @@
   * Disable VIA hardware RNG by default. Use hw.nehemiah_rng_enable
     sysctl to re-enable (but read about the security implications
     first). (Closes: #735448)
+  * Apply upstream EN-14_02.mmap patch.
 
  -- Robert Millan <rmh at debian.org>  Tue, 21 Jan 2014 12:26:33 +0100
 

Added: branches/wheezy/kfreebsd-9/debian/patches/EN-14_02.mmap.patch
===================================================================
--- branches/wheezy/kfreebsd-9/debian/patches/EN-14_02.mmap.patch	                        (rev 0)
+++ branches/wheezy/kfreebsd-9/debian/patches/EN-14_02.mmap.patch	2014-01-22 21:59:49 UTC (rev 5375)
@@ -0,0 +1,21 @@
+
+From http://security.freebsd.org/patches/EN-14:02/mmap.patch
+
+--- a/sys/vm/vm_map.c
++++ b/sys/vm/vm_map.c
+@@ -1232,6 +1232,7 @@
+ 	}
+ 	else if ((prev_entry != &map->header) &&
+ 		 (prev_entry->eflags == protoeflags) &&
++		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
+ 		 (prev_entry->end == start) &&
+ 		 (prev_entry->wired_count == 0) &&
+ 		 (prev_entry->cred == cred ||
+@@ -3199,7 +3200,6 @@
+ 	 * NOTE: We explicitly allow bi-directional stacks.
+ 	 */
+ 	orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
+-	cow &= ~orient;
+ 	KASSERT(orient != 0, ("No stack grow direction"));
+ 
+ 	if (addrbos < vm_map_min(map) ||

Modified: branches/wheezy/kfreebsd-9/debian/patches/series
===================================================================
--- branches/wheezy/kfreebsd-9/debian/patches/series	2014-01-21 11:58:54 UTC (rev 5374)
+++ branches/wheezy/kfreebsd-9/debian/patches/series	2014-01-22 21:59:49 UTC (rev 5375)
@@ -18,6 +18,7 @@
 disable_via_rng.diff
 
 # Other patches that might or might not be mergeable
+EN-14_02.mmap.patch
 001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff