Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:22:38 UTC 2022
Modified Files:
src/sys/kern: kern_pax.c
Log Message:
kern/kern_pax.c: Get maxsmap from sys/resourcevar.h.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/kern/kern_pax.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/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.62 src/sys/kern/kern_pax.c:1.63
--- src/sys/kern/kern_pax.c:1.62 Mon Aug 30 01:25:10 2021
+++ src/sys/kern/kern_pax.c Wed Oct 26 23:22:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.62 2021/08/30 01:25:10 rin Exp $ */
+/* $NetBSD: kern_pax.c,v 1.63 2022/10/26 23:22:38 riastradh Exp $ */
/*
* Copyright (c) 2015, 2020 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.62 2021/08/30 01:25:10 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.63 2022/10/26 23:22:38 riastradh Exp $");
#include "opt_pax.h"
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
#ifdef PAX_ASLR
#include <sys/mman.h>
+#include <sys/resourcevar.h>
int pax_aslr_enabled = 1;
int pax_aslr_global = PAX_ASLR;
@@ -336,7 +337,6 @@ pax_init(void)
{
#ifdef PAX_ASLR
/* Adjust maximum stack by the size we can consume for ASLR */
- extern rlim_t maxsmap;
maxsmap = MAXSSIZ - (MAXSSIZ / PAX_ASLR_MAX_STACK_WASTE);
// XXX: compat32 is not handled.
#endif
