svn commit: r353921 - stable/12/sys/amd64/amd64

[Mark Johnston]

Author: markj
Date: Wed Oct 23 13:40:39 2019
New Revision: 353921
URL: https://svnweb.freebsd.org/changeset/base/353921

Log:
  MFC r352622:
  Set NX in mappings created by pmap_kenter() and pmap_kenter_attr().

Modified:
  stable/12/sys/amd64/amd64/pmap.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/12/sys/amd64/amd64/pmap.c	Wed Oct 23 13:21:15 2019	(r353920)
+++ stable/12/sys/amd64/amd64/pmap.c	Wed Oct 23 13:40:39 2019	(r353921)
@@ -3135,7 +3135,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t pa)
 	pt_entry_t *pte;
 
 	pte = vtopte(va);
-	pte_store(pte, pa | X86_PG_RW | X86_PG_V | pg_g);
+	pte_store(pte, pa | X86_PG_RW | X86_PG_V | pg_g | pg_nx);
 }
 
 static __inline void
@@ -3146,7 +3146,7 @@ pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mo
 
 	pte = vtopte(va);
 	cache_bits = pmap_cache_bits(kernel_pmap, mode, 0);
-	pte_store(pte, pa | X86_PG_RW | X86_PG_V | pg_g | cache_bits);
+	pte_store(pte, pa | X86_PG_RW | X86_PG_V | pg_g | pg_nx | cache_bits);
 }
 
 /*