From owner-svn-src-all@FreeBSD.ORG  Sun Jun 10 11:31:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 898DA106567D;
	Sun, 10 Jun 2012 11:31:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 758BF8FC1A;
	Sun, 10 Jun 2012 11:31:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5ABVpVq094358;
	Sun, 10 Jun 2012 11:31:51 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5ABVpwo094356;
	Sun, 10 Jun 2012 11:31:51 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206101131.q5ABVpwo094356@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 10 Jun 2012 11:31:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236848 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jun 2012 11:31:51 -0000

Author: kib
Date: Sun Jun 10 11:31:50 2012
New Revision: 236848
URL: http://svn.freebsd.org/changeset/base/236848

Log:
  Use the previous stack entry protection and max protection to correctly
  propagate the stack execution permissions when stack is grown down.
  
  First, curproc->p_sysent->sv_stackprot specifies maximum allowed stack
  protection for current ABI, so the new stack entry was typically marked
  executable always. Second, for non-main stack MAP_STACK mapping,
  the PROT_ flags should be used which were specified at the mmap(2) call
  time, and not sv_stackprot.
  
  MFC after:	1 week

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Sun Jun 10 11:17:14 2012	(r236847)
+++ head/sys/vm/vm_map.c	Sun Jun 10 11:31:50 2012	(r236848)
@@ -3528,7 +3528,7 @@ Retry:
 		}
 
 		rv = vm_map_insert(map, NULL, 0, addr, stack_entry->start,
-		    p->p_sysent->sv_stackprot, VM_PROT_ALL, 0);
+		    next_entry->protection, next_entry->max_protection, 0);
 
 		/* Adjust the available stack space by the amount we grew. */
 		if (rv == KERN_SUCCESS) {