Commit 9bc0b029 authored Jul 04, 2020 by Linus Torvalds

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

parents ec84c3f6 19ab500e

arch/powerpc/mm/book3s64/pkeys.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message