Module Name: src
Committed By: christos
Date: Sun Mar 20 16:39:36 UTC 2016
Modified Files:
src/sys/kern: kern_pax.c
Log Message:
simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 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.35 src/sys/kern/kern_pax.c:1.36
--- src/sys/kern/kern_pax.c:1.35 Sun Mar 20 10:58:10 2016
+++ src/sys/kern/kern_pax.c Sun Mar 20 12:39:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.35 2016/03/20 14:58:10 khorben Exp $ */
+/* $NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 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.35 2016/03/20 14:58:10 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 christos Exp $");
#include "opt_pax.h"
@@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
#ifdef PAX_ASLR
#include <sys/mman.h>
-#include <compat/netbsd32/netbsd32.h>
int pax_aslr_enabled = 1;
int pax_aslr_global = PAX_ASLR;
@@ -97,6 +96,9 @@ int pax_aslr_global = PAX_ASLR;
#ifndef PAX_ASLR_DELTA_MMAP_LEN
#define PAX_ASLR_DELTA_MMAP_LEN ((sizeof(void *) * NBBY) / 2)
#endif
+#ifndef PAX_ASLR_DELTA_MMAP_LEN32
+#define PAX_ASLR_DELTA_MMAP_LEN32 ((sizeof(uint32_t) * NBBY) / 2)
+#endif
#ifndef PAX_ASLR_DELTA_STACK_LSB
#define PAX_ASLR_DELTA_STACK_LSB PGSHIFT
#endif
@@ -405,14 +407,13 @@ pax_aslr_init_vm(struct lwp *l, struct v
if (!pax_aslr_active(l))
return;
- if (ep->ep_flags & EXEC_32)
- vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
- PAX_ASLR_DELTA_MMAP_LSB,
- (sizeof(netbsd32_pointer_t) * NBBY) / 2);
- else
- vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
- PAX_ASLR_DELTA_MMAP_LSB, PAX_ASLR_DELTA_MMAP_LEN);
- PAX_DPRINTF("delta_mmap=%#jx", vm->vm_aslr_delta_mmap);
+ uint32_t len = (ep->ep_flags & EXEC_32) ?
+ PAX_ASLR_DELTA_MMAP_LEN32 : PAX_ASLR_DELTA_MMAP_LEN;
+
+ vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
+ PAX_ASLR_DELTA_MMAP_LSB, len);
+
+ PAX_DPRINTF("delta_mmap=%#jx/%u", vm->vm_aslr_delta_mmap, len);
}
void
