Module Name: src
Committed By: christos
Date: Fri May 27 16:35:16 UTC 2016
Modified Files:
src/sys/kern: kern_pax.c
Log Message:
fix compilation without PAX_MPROTECT
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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.54 src/sys/kern/kern_pax.c:1.55
--- src/sys/kern/kern_pax.c:1.54 Wed May 25 16:49:00 2016
+++ src/sys/kern/kern_pax.c Fri May 27 12:35:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pax.c,v 1.54 2016/05/25 20:49:00 wiz Exp $ */
+/* $NetBSD: kern_pax.c,v 1.55 2016/05/27 16:35:16 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.54 2016/05/25 20:49:00 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.55 2016/05/27 16:35:16 christos Exp $");
#include "opt_pax.h"
@@ -359,6 +359,7 @@ pax_set_flags(struct exec_package *epp,
{
p->p_pax = epp->ep_pax_flags;
+#ifdef PAX_MPROTECT
if (pax_mprotect_ptrace == 0)
return;
/*
@@ -367,6 +368,7 @@ pax_set_flags(struct exec_package *epp,
*/
if (p->p_slflag & PSL_TRACED)
p->p_pax &= ~P_PAX_MPROTECT;
+#endif
}
void
