Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern fix compilation without PAX_MPROTECT



details:   https://anonhg.NetBSD.org/src/rev/99e74b3ee413
branches:  trunk
changeset: 815578:99e74b3ee413
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 27 16:35:16 2016 +0000

description:
fix compilation without PAX_MPROTECT

diffstat:

 sys/kern/kern_pax.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 896a87b2d99f -r 99e74b3ee413 sys/kern/kern_pax.c
--- a/sys/kern/kern_pax.c       Fri May 27 05:50:07 2016 +0000
+++ b/sys/kern/kern_pax.c       Fri May 27 16:35:16 2016 +0000
@@ -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 @@
 {
        p->p_pax = epp->ep_pax_flags;
 
+#ifdef PAX_MPROTECT
        if (pax_mprotect_ptrace == 0)
                return;
        /*
@@ -367,6 +368,7 @@
         */
        if (p->p_slflag & PSL_TRACED)
                p->p_pax &= ~P_PAX_MPROTECT;
+#endif
 }
 
 void



Home | Main Index | Thread Index | Old Index