Module Name: src
Committed By: christos
Date: Mon Dec 3 00:11:02 UTC 2018
Modified Files:
src/sys/kern: files.kern init_sysctl.c
Log Message:
Expose addresses depending on the KASLR setting (from mrg@). Restores the
status quo of exposing kernel addresses if there is no KASLR.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/files.kern
cvs rdiff -u -r1.219 -r1.220 src/sys/kern/init_sysctl.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/files.kern
diff -u src/sys/kern/files.kern:1.26 src/sys/kern/files.kern:1.27
--- src/sys/kern/files.kern:1.26 Sun Dec 2 16:00:13 2018
+++ src/sys/kern/files.kern Sun Dec 2 19:11:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.kern,v 1.26 2018/12/02 21:00:13 maxv Exp $
+# $NetBSD: files.kern,v 1.27 2018/12/03 00:11:02 christos Exp $
#
# kernel sources
@@ -6,6 +6,7 @@
define kern: machdep, uvm
defflag opt_kern.h KERN
defflag opt_script.h SETUIDSCRIPTS FDSCRIPTS
+defflag KASLR
file compat/common/compat_util.c kern
file compat/common/compat_mod.c compat_netbsd | compat_netbsd32
file conf/debugsyms.c kern
Index: src/sys/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.219 src/sys/kern/init_sysctl.c:1.220
--- src/sys/kern/init_sysctl.c:1.219 Sat Nov 24 12:26:27 2018
+++ src/sys/kern/init_sysctl.c Sun Dec 2 19:11:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.219 2018/11/24 17:26:27 maxv Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.220 2018/12/03 00:11:02 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.219 2018/11/24 17:26:27 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.220 2018/12/03 00:11:02 christos Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
#include "opt_gprof.h"
+#include "opt_kaslr.h"
#include "pty.h"
#include <sys/types.h>
@@ -85,7 +86,11 @@ int kern_has_sysvmsg = 0;
int kern_has_sysvshm = 0;
int kern_has_sysvsem = 0;
+#ifdef KASLR
int kern_expose_address = 0;
+#else
+int kern_expose_address = 1;
+#endif
static const u_int sysctl_lwpprflagmap[] = {
LPR_DETACHED, L_DETACHED,
