Module Name: src
Committed By: christos
Date: Sun May 22 01:09:09 UTC 2016
Modified Files:
src/sys/arch/sparc64/include: proc.h
src/sys/kern: kern_pax.c
Log Message:
Account for the VA hole differently (simpler)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/include/proc.h
cvs rdiff -u -r1.47 -r1.48 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/arch/sparc64/include/proc.h
diff -u src/sys/arch/sparc64/include/proc.h:1.15 src/sys/arch/sparc64/include/proc.h:1.16
--- src/sys/arch/sparc64/include/proc.h:1.15 Thu May 19 11:36:35 2016
+++ src/sys/arch/sparc64/include/proc.h Sat May 21 21:09:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.15 2016/05/19 15:36:35 christos Exp $ */
+/* $NetBSD: proc.h,v 1.16 2016/05/22 01:09:09 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -60,6 +60,7 @@ struct mdproc {
#define netbsd32_syscall_intern syscall_intern
-#define PAX_ASLR_RAND_MMAP_MAX 0x40000
+/* Override to account for the VA hole */
+#define PAX_ASLR_DELTA_MMAP_LEN 18
#endif /* _SPARC64_PROC_H */
Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.47 src/sys/kern/kern_pax.c:1.48
--- src/sys/kern/kern_pax.c:1.47 Thu May 19 17:39:15 2016
+++ src/sys/kern/kern_pax.c Sat May 21 21:09:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.47 2016/05/19 21:39:15 christos Exp $ */
+/* $NetBSD: kern_pax.c,v 1.48 2016/05/22 01:09:09 christos Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.47 2016/05/19 21:39:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.48 2016/05/22 01:09:09 christos Exp $");
#include "opt_pax.h"
@@ -482,9 +482,6 @@ pax_aslr_init_vm(struct lwp *l, struct v
if (pax_aslr_flags & PAX_ASLR_FIXED)
rand = pax_aslr_rand;
#endif
-#ifdef PAX_ASLR_RAND_MMAP_MAX
- rand &= PAX_ASLR_RAND_MMAP_MAX - 1;
-#endif
vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(rand,
PAX_ASLR_DELTA_MMAP_LSB, len);
