From owner-svn-src-all@FreeBSD.ORG  Sat Apr 25 08:03:37 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 66A0BFC7;
 Sat, 25 Apr 2015 08:03:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 54B4011EF;
 Sat, 25 Apr 2015 08:03:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3P83bwK054763;
 Sat, 25 Apr 2015 08:03:37 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3P83b3K054762;
 Sat, 25 Apr 2015 08:03:37 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201504250803.t3P83b3K054762@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 25 Apr 2015 08:03:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281978 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Sat, 25 Apr 2015 08:03:37 -0000

Author: kib
Date: Sat Apr 25 08:03:36 2015
New Revision: 281978
URL: https://svnweb.freebsd.org/changeset/base/281978

Log:
  MFC r281883:
  Handle incorrect ELF images specifying size for PT_GNU_STACK not being
  multiple of page size.

Modified:
  stable/10/sys/kern/kern_exec.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_exec.c
==============================================================================
--- stable/10/sys/kern/kern_exec.c	Sat Apr 25 06:50:15 2015	(r281977)
+++ stable/10/sys/kern/kern_exec.c	Sat Apr 25 08:03:36 2015	(r281978)
@@ -1089,7 +1089,7 @@ exec_new_vmspace(imgp, sv)
 
 	/* Allocate a new stack */
 	if (imgp->stack_sz != 0) {
-		ssiz = imgp->stack_sz;
+		ssiz = trunc_page(imgp->stack_sz);
 		PROC_LOCK(p);
 		lim_rlimit(p, RLIMIT_STACK, &rlim_stack);
 		PROC_UNLOCK(p);