Module Name: src
Committed By: snj
Date: Wed Jan 3 20:17:36 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [netbsd-7-0]: pmap.c
Log Message:
Apply patch (requested by maxv in ticket #1531):
amd64: Make the direct map non executable.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.2.2.3 -r1.183.2.2.2.4 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.183.2.2.2.3 src/sys/arch/x86/x86/pmap.c:1.183.2.2.2.4
--- src/sys/arch/x86/x86/pmap.c:1.183.2.2.2.3 Mon Mar 6 03:32:45 2017
+++ src/sys/arch/x86/x86/pmap.c Wed Jan 3 20:17:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.183.2.2.2.3 2017/03/06 03:32:45 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.183.2.2.2.4 2018/01/03 20:17:36 snj Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.2.2.3 2017/03/06 03:32:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.2.2.4 2018/01/03 20:17:36 snj Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -1517,7 +1517,7 @@ pmap_bootstrap(vaddr_t kva_start)
}
}
- kpm->pm_pdir[PDIR_SLOT_DIRECT] = dmpdp | PG_KW | PG_V | PG_U;
+ kpm->pm_pdir[PDIR_SLOT_DIRECT] = dmpdp | PG_KW | PG_V | PG_U | pg_nx;
tlbflush();
