Module Name: src
Committed By: maxv
Date: Tue Nov 1 12:16:10 UTC 2016
Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Map the PTE space as non-executable on PAE. The same is already done on
amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/xen/x86/x86_xpmap.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/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.62 src/sys/arch/xen/x86/x86_xpmap.c:1.63
--- src/sys/arch/xen/x86/x86_xpmap.c:1.62 Tue Nov 1 12:00:21 2016
+++ src/sys/arch/xen/x86/x86_xpmap.c Tue Nov 1 12:16:10 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.62 2016/11/01 12:00:21 maxv Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.63 2016/11/01 12:16:10 maxv Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <[email protected]>
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.62 2016/11/01 12:00:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.63 2016/11/01 12:16:10 maxv Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -994,7 +994,8 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
*/
addr = (u_long)pde - KERNBASE;
for (i = 0; i < 3; i++, addr += PAGE_SIZE) {
- pde[PDIR_SLOT_PTE + i] = xpmap_ptom_masked(addr) | PG_k | PG_V;
+ pde[PDIR_SLOT_PTE + i] = xpmap_ptom_masked(addr) | PG_k | PG_V |
+ pg_nx;
__PRINTK(("pde[%d] va %#" PRIxVADDR " pa %#" PRIxPADDR
" entry %#" PRIxPADDR "\n",
(int)(PDIR_SLOT_PTE + i), pde + PAGE_SIZE * i,
