Module Name: src Committed By: snj Date: Wed Jan 3 20:17:38 UTC 2018
Modified Files: src/sys/arch/x86/x86 [netbsd-7-1]: 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.6 -r1.183.2.6.2.1 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.6 src/sys/arch/x86/x86/pmap.c:1.183.2.6.2.1 --- src/sys/arch/x86/x86/pmap.c:1.183.2.6 Mon Mar 6 03:27:19 2017 +++ src/sys/arch/x86/x86/pmap.c Wed Jan 3 20:17:38 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.183.2.6 2017/03/06 03:27:19 snj Exp $ */ +/* $NetBSD: pmap.c,v 1.183.2.6.2.1 2018/01/03 20:17:38 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.6 2017/03/06 03:27:19 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.6.2.1 2018/01/03 20:17:38 snj Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -1523,7 +1523,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();