Module Name: src
Committed By: christos
Date: Mon Mar 15 20:35:20 UTC 2010
Modified Files:
src/sys/conf: files
src/sys/kern: exec_elf.c kern_pax.c
Log Message:
rename DEBUG_ASLR -> PAX_ASLR_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.982 -r1.983 src/sys/conf/files
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.22 -r1.23 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/conf/files
diff -u src/sys/conf/files:1.982 src/sys/conf/files:1.983
--- src/sys/conf/files:1.982 Sat Mar 13 03:33:26 2010
+++ src/sys/conf/files Mon Mar 15 16:35:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.982 2010/03/13 08:33:26 darran Exp $
+# $NetBSD: files,v 1.983 2010/03/15 20:35:19 christos Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -109,6 +109,7 @@
PAX_ASLR_DELTA_STACK_LSB
PAX_ASLR_DELTA_STACK_LEN
PAX_ASLR_DELTA_PROG_LEN
+ PAX_ASLR_DEBUG
defflag opt_fileassoc.h FILEASSOC
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.13 src/sys/kern/exec_elf.c:1.14
--- src/sys/kern/exec_elf.c:1.13 Mon Feb 22 14:46:18 2010
+++ src/sys/kern/exec_elf.c Mon Mar 15 16:35:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.13 2010/02/22 19:46:18 drochner Exp $ */
+/* $NetBSD: exec_elf.c,v 1.14 2010/03/15 20:35:20 christos Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.13 2010/02/22 19:46:18 drochner Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.14 2010/03/15 20:35:20 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -139,18 +139,18 @@
if (pax_align == 0)
pax_align = PGSHIFT;
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
uprintf("r=0x%x a=0x%x p=0x%x Delta=0x%lx\n", r,
ilog2(pax_align), PGSHIFT, PAX_ASLR_DELTA(r,
ilog2(pax_align), PAX_ASLR_DELTA_EXEC_LEN));
#endif
pax_offset = ELF_TRUNC(PAX_ASLR_DELTA(r,
- ilog2(pax_align), PAX_ASLR_DELTA_EXEC_LEN), pax_align);
+ ilog2(pax_align), PAX_ASLR_DELTA_EXEC_LEN), pax_align) + PAGE_SIZE;
for (i = 0; i < eh->e_phnum; i++)
ph[i].p_vaddr += pax_offset;
eh->e_entry += pax_offset;
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
uprintf("pax offset=0x%zx entry=0x%llx\n",
pax_offset, (unsigned long long)eh->e_entry);
#endif
Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.22 src/sys/kern/kern_pax.c:1.23
--- src/sys/kern/kern_pax.c:1.22 Wed Jun 4 08:26:20 2008
+++ src/sys/kern/kern_pax.c Mon Mar 15 16:35:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.22 2008/06/04 12:26:20 ad Exp $ */
+/* $NetBSD: kern_pax.c,v 1.23 2010/03/15 20:35:20 christos Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.22 2008/06/04 12:26:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.23 2010/03/15 20:35:20 christos Exp $");
#include "opt_pax.h"
@@ -321,7 +321,7 @@
return;
if (!(f & MAP_FIXED) && ((orig_addr == 0) || !(f & MAP_ANON))) {
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
uprintf("applying to 0x%lx orig_addr=0x%lx f=%x\n",
(unsigned long)*addr, (unsigned long)orig_addr, f);
#endif
@@ -329,11 +329,11 @@
*addr += l->l_proc->p_vmspace->vm_aslr_delta_mmap;
else
*addr -= l->l_proc->p_vmspace->vm_aslr_delta_mmap;
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
uprintf("result 0x%lx\n", *addr);
#endif
}
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
else
uprintf("not applying to 0x%lx orig_addr=0x%lx f=%x\n",
(unsigned long)*addr, (unsigned long)orig_addr, f);
@@ -347,7 +347,7 @@
u_long d = PAX_ASLR_DELTA(arc4random(),
PAX_ASLR_DELTA_STACK_LSB,
PAX_ASLR_DELTA_STACK_LEN);
-#ifdef DEBUG_ASLR
+#ifdef PAX_ASLR_DEBUG
uprintf("stack 0x%lx d=0x%lx 0x%lx\n",
epp->ep_minsaddr, d, epp->ep_minsaddr - d);
#endif
