openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: mm: Mark executable text as guarded pages 

When the kernel is built for BTI and running on a system which supports
make all executable text guarded pages to ensure that loadable module
and JITed BPF code is protected by BTI.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20200506195138.22086-7-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Mark Brown 2020-05-06 20:51:33 +01:00 committed by Will Deacon
parent fa76cfe65c
commit 67d4a1cd09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/mm/pageattr.c
View File

@ -126,13 +126,13 @@ int set_memory_nx(unsigned long addr, int numpages)
{ {
return change_memory_common(addr, numpages, return change_memory_common(addr, numpages,
__pgprot(PTE_PXN), __pgprot(PTE_PXN),
__pgprot(0)); __pgprot(PTE_MAYBE_GP));
} }
int set_memory_x(unsigned long addr, int numpages) int set_memory_x(unsigned long addr, int numpages)
{ {
return change_memory_common(addr, numpages, return change_memory_common(addr, numpages,
__pgprot(0), __pgprot(PTE_MAYBE_GP),
__pgprot(PTE_PXN)); __pgprot(PTE_PXN));
} }