diff options
| author |   Laura Abbott <labbott@fedoraproject.org> | 2015-11-12 12:21:10 -0800 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2015-11-18 12:11:36 +0000 |
| commit | 0b2aa5b80bbf4d0fb5daa1fb83ff637daa12d552 (patch) | |
| tree | a248ea243cfab6aa039b2a0bac4d4f64c49bfa5f /arch/arm64/mm/mmu.c | |
| parent | arm64: crypto: reduce priority of core AES cipher (diff) | |
| download | linux-dev-0b2aa5b80bbf4d0fb5daa1fb83ff637daa12d552.tar.xz linux-dev-0b2aa5b80bbf4d0fb5daa1fb83ff637daa12d552.zip | |
arm64: Fix R/O permissions in mark_rodata_ro
The permissions in mark_rodata_ro trigger a build error
with STRICT_MM_TYPECHECKS. Fix this by introducing
PAGE_KERNEL_ROX for the same reasons as PAGE_KERNEL_RO.
From Ard:
"PAGE_KERNEL_EXEC has PTE_WRITE set as well, making the range
writeable under the ARMv8.1 DBM feature, that manages the
dirty bit in hardware (writing to a page with the PTE_RDONLY
and PTE_WRITE bits both set will clear the PTE_RDONLY bit in that case)"
Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 32ddd893da9a..abb66f84d4ac 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -475,7 +475,7 @@ void mark_rodata_ro(void) { create_mapping_late(__pa(_stext), (unsigned long)_stext, (unsigned long)_etext - (unsigned long)_stext, - PAGE_KERNEL_EXEC | PTE_RDONLY); + PAGE_KERNEL_ROX); } #endif |