Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

arm/arm64: KVM: Make default HYP mappings non-excutable

Structures that can be generally written to don't have any requirement
to be executable (quite the opposite). This includes the kvm and vcpu
structures, as well as the stacks.

Let's change the default to incorporate the XN flag.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Marc Zyngier 9 years ago
parent
5900270550
commit
0996353f8e
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      arch/arm/include/asm/pgtable.h
  2. 1 1
      arch/arm64/include/asm/pgtable-prot.h

+ 1 - 1
arch/arm/include/asm/pgtable.h
View File 

@@ -97,7 +97,7 @@ extern pgprot_t		pgprot_s2_device;
 
 #define PAGE_READONLY_EXEC	_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_RDONLY)
 
 #define PAGE_KERNEL		_MOD_PROT(pgprot_kernel, L_PTE_XN)
 
 #define PAGE_KERNEL_EXEC	pgprot_kernel
 
-#define PAGE_HYP		_MOD_PROT(pgprot_kernel, L_PTE_HYP)
 
+#define PAGE_HYP		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_XN)
 
 #define PAGE_HYP_EXEC		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY)
 
 #define PAGE_HYP_RO		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY | L_PTE_XN)
 
 #define PAGE_HYP_DEVICE		_MOD_PROT(pgprot_hyp_device, L_PTE_HYP)

+ 1 - 1
arch/arm64/include/asm/pgtable-prot.h
View File 

@@ -55,7 +55,7 @@
 
 #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE)
 
 #define PAGE_KERNEL_EXEC_CONT	__pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_CONT)
 
 
-#define PAGE_HYP		__pgprot(_PAGE_DEFAULT | PTE_HYP)
 
+#define PAGE_HYP		__pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN)
 
 #define PAGE_HYP_EXEC		__pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY)
 
 #define PAGE_HYP_RO		__pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN)
 
 #define PAGE_HYP_DEVICE		__pgprot(PROT_DEVICE_nGnRE | PTE_HYP)