]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
arm64: Honour !PTE_WRITE in set_pte_at() for kernel mappings
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 7 Jan 2016 16:07:20 +0000 (16:07 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 May 2016 21:48:42 +0000 (14:48 -0700)
commitbdb0618ad1b9ea6ec6926450c687d133ccddf28c
tree8722bdb65a0b1989f9ac67cc613c98fd65e30cb8
parentc0944355a74bc9c2b5b3cc5b627efe0c73e30bd9
arm64: Honour !PTE_WRITE in set_pte_at() for kernel mappings

commit ac15bd63bbb24238f763ec5b24ee175ec301e8cd upstream.

Currently, set_pte_at() only checks the software PTE_WRITE bit for user
mappings when it sets or clears the hardware PTE_RDONLY accordingly. The
kernel ptes are written directly without any modification, relying
solely on the protection bits in macros like PAGE_KERNEL. However,
modifying kernel pte attributes via pte_wrprotect() would be ignored by
set_pte_at(). Since pte_wrprotect() does not set PTE_RDONLY (it only
clears PTE_WRITE), the new permission is not taken into account.

This patch changes set_pte_at() to adjust the read-only permission for
kernel ptes as well. As a side effect, existing PROT_* definitions used
for kernel ioremap*() need to include PTE_DIRTY | PTE_WRITE.

(additionally, white space fix for PTE_KERNEL_ROX)

Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/include/asm/pgtable.h