Module Name: src
Committed By: riastradh
Date: Tue Nov 21 00:09:19 UTC 2023
Modified Files:
src/sys/kern: exec_subr.c
src/tests/lib/libc/sys: t_setrlimit.c
Log Message:
exec: Map noaccess part of stack with prot=NONE, maxprot=READ|WRITE.
This way, setrlimit(RLIMT_STACK) can grant READ|WRITE access when
increasing the stack size.
PR kern/57711
XXX pullup-10
XXX pullup-9
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/exec_subr.c
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/sys/t_setrlimit.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.85 src/sys/kern/exec_subr.c:1.86
--- src/sys/kern/exec_subr.c:1.85 Sun Apr 9 09:18:09 2023
+++ src/sys/kern/exec_subr.c Tue Nov 21 00:09:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_subr.c,v 1.85 2023/04/09 09:18:09 riastradh Exp $ */
+/* $NetBSD: exec_subr.c,v 1.86 2023/11/21 00:09:18 riastradh 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.85 2023/04/09 09:18:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.86 2023/11/21 00:09:18 riastradh Exp $");
#include "opt_pax.h"
@@ -162,9 +162,10 @@ static int
vmcmd_get_prot(struct lwp *l, const struct exec_vmcmd *cmd, vm_prot_t *prot,
vm_prot_t *maxprot)
{
+ vm_prot_t extraprot = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
- *prot = cmd->ev_prot;
- *maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, 0, UVM_PROT_ALL);
+ *prot = cmd->ev_prot & UVM_PROT_ALL;
+ *maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, extraprot, UVM_PROT_ALL);
if ((*prot & *maxprot) != *prot)
return EACCES;
@@ -458,7 +459,9 @@ exec_setup_stack(struct lwp *l, struct e
}
if (noaccess_size > 0 && noaccess_size <= MAXSSIZ) {
NEW_VMCMD2(&epp->ep_vmcmds, vmcmd_map_zero, noaccess_size,
- noaccess_linear_min, NULL, 0, VM_PROT_NONE, VMCMD_STACK);
+ noaccess_linear_min, NULL, 0,
+ VM_PROT_NONE | PROT_MPROTECT(VM_PROT_READ | VM_PROT_WRITE),
+ VMCMD_STACK);
}
KASSERT(access_size > 0);
KASSERT(access_size <= MAXSSIZ);
Index: src/tests/lib/libc/sys/t_setrlimit.c
diff -u src/tests/lib/libc/sys/t_setrlimit.c:1.8 src/tests/lib/libc/sys/t_setrlimit.c:1.9
--- src/tests/lib/libc/sys/t_setrlimit.c:1.8 Mon Nov 20 13:05:17 2023
+++ src/tests/lib/libc/sys/t_setrlimit.c Tue Nov 21 00:09:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_setrlimit.c,v 1.8 2023/11/20 13:05:17 riastradh Exp $ */
+/* $NetBSD: t_setrlimit.c,v 1.9 2023/11/21 00:09:18 riastradh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_setrlimit.c,v 1.8 2023/11/20 13:05:17 riastradh Exp $");
+__RCSID("$NetBSD: t_setrlimit.c,v 1.9 2023/11/21 00:09:18 riastradh Exp $");
#include <sys/resource.h>
#include <sys/mman.h>
@@ -634,9 +634,6 @@ ATF_TC_BODY(setrlimit_stack_growshrink,
res.rlim_cur = 2*n;
RL(setrlimit(RLIMIT_STACK, &res));
- atf_tc_expect_fail("PR kern/57711:"
- " setrlimit(RLIMIT_STACK) fails to increase usable stack size");
-
/*
* Verify that we can now get at pages past the end of the new
* stack but not beyond that.
