From owner-svn-src-head@FreeBSD.ORG  Thu Apr 23 11:27:21 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 D00C6EAB;
 Thu, 23 Apr 2015 11:27:21 +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 BEACF1ED6;
 Thu, 23 Apr 2015 11:27:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NBRL75079503;
 Thu, 23 Apr 2015 11:27:21 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NBRLQu079502;
 Thu, 23 Apr 2015 11:27:21 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201504231127.t3NBRLQu079502@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: Thu, 23 Apr 2015 11:27:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281883 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2015 11:27:21 -0000

Author: kib
Date: Thu Apr 23 11:27:21 2015
New Revision: 281883
URL: https://svnweb.freebsd.org/changeset/base/281883

Log:
  Handle incorrect ELF images specifying size for PT_GNU_STACK not being
  multiple of page size.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	3 days

Modified:
  head/sys/kern/kern_exec.c

Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c	Thu Apr 23 08:41:50 2015	(r281882)
+++ head/sys/kern/kern_exec.c	Thu Apr 23 11:27:21 2015	(r281883)
@@ -1060,7 +1060,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);