aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-07-04 14:46:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-07-04 14:46:11 -0700
commit9bc0b029a8889f2c67c988760aba66a8d7b22af5 (patch)
treed27cd1b860e00329515d59c57f42e40119f419c8
parentec84c3f6ef710661c8d14e3f63e540b795dc0a51 (diff)
parent19ab500edb5d6020010caba48ce3b4ce4182ab63 (diff)
downloadlinux-stericsson-9bc0b029a8889f2c67c988760aba66a8d7b22af5.tar.gz
Merge tag 'powerpc-5.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "One fix for a regression in our pkey handling, which exhibits as PROT_EXEC mappings taking continuous page faults. Thanks to: Jan Stancek, Aneesh Kumar K.V" * tag 'powerpc-5.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/mm/pkeys: Make pkey access check work on execute_only_key
-rw-r--r--arch/powerpc/mm/book3s64/pkeys.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index 1199fc2bfaec..ca5fcb4bff32 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c
@@ -353,9 +353,6 @@ static bool pkey_access_permitted(int pkey, bool write, bool execute)
int pkey_shift;
u64 amr;
- if (!is_pkey_enabled(pkey))
- return true;
-
pkey_shift = pkeyshift(pkey);
if (execute && !(read_iamr() & (IAMR_EX_BIT << pkey_shift)))
return true;