svn commit: r286306 - stable/10/sys/vm

[Konstantin Belousov]

Author: kib
Date: Wed Aug  5 07:29:59 2015
New Revision: 286306
URL: https://svnweb.freebsd.org/changeset/base/286306

Log:
  MFC r285046:
  Account for the main process stack being one page below the highest
  user address when ABI uses shared page.

Modified:
  stable/10/sys/vm/vm_map.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_map.c
==============================================================================
--- stable/10/sys/vm/vm_map.c	Wed Aug  5 07:21:44 2015	(r286305)
+++ stable/10/sys/vm/vm_map.c	Wed Aug  5 07:29:59 2015	(r286306)
@@ -3657,7 +3657,8 @@ Retry:
 		return (KERN_NO_SPACE);
 	}
 
-	is_procstack = (addr >= (vm_offset_t)vm->vm_maxsaddr) ? 1 : 0;
+	is_procstack = (addr >= (vm_offset_t)vm->vm_maxsaddr &&
+	    addr < (vm_offset_t)p->p_sysent->sv_usrstack) ? 1 : 0;
 
 	/*
 	 * If this is the main process stack, see if we're over the stack