Fix Linux mmap with MAP_GROWSDOWN flag.

Reported by:	Andriy Gapon (avg at icyb dot net dot ua)
Tested by:	Andriy Gapon (avg at icyb dot net dot ua)
Pointyhat:	me
MFC after:	3 days

1 files changed, 14 insertions, 13 deletions

diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 7a7ce08..565e6d2 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -907,21 +907,22 @@ linux_mmap_common(struct thread *td, struct l_mmap_argv *linux_args)
 			PROC_UNLOCK(p);
 		}
 
-		/* This gives us our maximum stack size */
-		if (linux_args->len > STACK_SIZE - GUARD_SIZE)
-			bsd_args.len = linux_args->len;
-		else
-			bsd_args.len  = STACK_SIZE - GUARD_SIZE;
-
 		/*
-		 * This gives us a new BOS.  If we're using VM_STACK, then
-		 * mmap will just map the top SGROWSIZ bytes, and let
-		 * the stack grow down to the limit at BOS.  If we're
-		 * not using VM_STACK we map the full stack, since we
-		 * don't have a way to autogrow it.
+		 * This gives us our maximum stack size and a new BOS.
+		 * If we're using VM_STACK, then mmap will just map
+		 * the top SGROWSIZ bytes, and let the stack grow down
+		 * to the limit at BOS.  If we're not using VM_STACK
+		 * we map the full stack, since we don't have a way
+		 * to autogrow it.
 		 */
-		bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
-		    bsd_args.len;
+		if (linux_args->len > STACK_SIZE - GUARD_SIZE) {
+			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
+			bsd_args.len = linux_args->len;
+		} else {
+			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
+			    (STACK_SIZE - GUARD_SIZE - linux_args->len);
+			bsd_args.len = STACK_SIZE - GUARD_SIZE;
+		}
 	} else {
 		bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
 		bsd_args.len  = linux_args->len;