Module Name: src
Committed By: maxv
Date: Tue Nov 1 12:00:21 UTC 2016
Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Map the remaining pages as non-executable. Only text should have X.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 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.61 src/sys/arch/xen/x86/x86_xpmap.c:1.62
--- src/sys/arch/xen/x86/x86_xpmap.c:1.61 Thu Aug 25 17:03:57 2016
+++ src/sys/arch/xen/x86/x86_xpmap.c Tue Nov 1 12:00:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.61 2016/08/25 17:03:57 bouyer Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.62 2016/11/01 12:00:21 maxv Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <m...@adviseo.fr>
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.61 2016/08/25 17:03:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.62 2016/11/01 12:00:21 maxv Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -950,8 +950,8 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
/* Map the kernel data+bss RW. */
pte[pl1_pi(page)] |= PG_RW | pg_nx;
} else {
- /* map page RW */
- pte[pl1_pi(page)] |= PG_RW;
+ /* Map the page RW. */
+ pte[pl1_pi(page)] |= PG_RW | pg_nx;
}
if ((page >= old_pgd && page < old_pgd + (old_count * PAGE_SIZE))
