[Midnightbsd-cvs] src [6603] trunk/sys/vm/vm_map.c: fix crash with vm system

[laffer1 at midnightbsd.org]

Revision: 6603
          http://svnweb.midnightbsd.org/src/?rev=6603
Author:   laffer1
Date:     2014-01-15 20:48:00 -0500 (Wed, 15 Jan 2014)
Log Message:
-----------
fix crash with vm system

Modified Paths:
--------------
    trunk/sys/vm/vm_map.c

Property Changed:
----------------
    trunk/sys/vm/vm_map.c

Modified: trunk/sys/vm/vm_map.c
===================================================================
--- trunk/sys/vm/vm_map.c	2014-01-16 01:45:51 UTC (rev 6602)
+++ trunk/sys/vm/vm_map.c	2014-01-16 01:48:00 UTC (rev 6603)
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/sys/vm/vm_map.c,v 1.5 2013/01/17 23:29:42 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1236,6 +1236,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 ||
@@ -3256,7 +3257,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) ||


Property changes on: trunk/sys/vm/vm_map.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property