Module Name: src
Committed By: enami
Date: Mon Aug 8 06:30:43 UTC 2011
Modified Files:
src/sys/kern: exec_subr.c
Log Message:
Bounds process's stack size with max_stack_size so that 32bit
binary works regardless of stack size limit setting.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/kern/exec_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.69 src/sys/kern/exec_subr.c:1.70
--- src/sys/kern/exec_subr.c:1.69 Thu Jun 23 23:42:44 2011
+++ src/sys/kern/exec_subr.c Mon Aug 8 06:30:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt Exp $ */
+/* $NetBSD: exec_subr.c,v 1.70 2011/08/08 06:30:43 enami Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.69 2011/06/23 23:42:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.70 2011/08/08 06:30:43 enami Exp $");
#include "opt_pax.h"
@@ -404,7 +404,8 @@
(unsigned long long)epp->ep_minsaddr,
(unsigned long long)max_stack_size));
- epp->ep_ssize = l->l_proc->p_rlimit[RLIMIT_STACK].rlim_cur;
+ epp->ep_ssize = MIN(l->l_proc->p_rlimit[RLIMIT_STACK].rlim_cur,
+ max_stack_size);
#ifdef PAX_ASLR
pax_aslr_stack(l, epp, &max_stack_size);
