Commit-ID: 7e7fd67ca39335a49619729821efb7cbdd674eb0 Gitweb: https://git.kernel.org/tip/7e7fd67ca39335a49619729821efb7cbdd674eb0 Author: Dave Hansen <dave.han...@linux.intel.com> AuthorDate: Wed, 9 May 2018 10:13:46 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 14 May 2018 11:14:45 +0200
x86/pkeys/selftests: Allow faults on unknown keys The exec-only pkey is allocated inside the kernel and userspace is not told what it is. So, allow PK faults to occur that have an unknown key. Signed-off-by: Dave Hansen <dave.han...@linux.intel.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Dave Hansen <dave.han...@intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Michael Ellermen <m...@ellerman.id.au> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Ram Pai <linux...@us.ibm.com> Cc: Shuah Khan <sh...@kernel.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux...@kvack.org Link: http://lkml.kernel.org/r/20180509171345.7fc7d...@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- tools/testing/selftests/x86/protection_keys.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index 5f5aedb80e7b..7d95acd2aec3 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -921,13 +921,21 @@ void *malloc_pkey(long size, int prot, u16 pkey) } int last_pkru_faults; +#define UNKNOWN_PKEY -2 void expected_pk_fault(int pkey) { dprintf2("%s(): last_pkru_faults: %d pkru_faults: %d\n", __func__, last_pkru_faults, pkru_faults); dprintf2("%s(%d): last_si_pkey: %d\n", __func__, pkey, last_si_pkey); pkey_assert(last_pkru_faults + 1 == pkru_faults); - pkey_assert(last_si_pkey == pkey); + + /* + * For exec-only memory, we do not know the pkey in + * advance, so skip this check. + */ + if (pkey != UNKNOWN_PKEY) + pkey_assert(last_si_pkey == pkey); + /* * The signal handler shold have cleared out PKRU to let the * test program continue. We now have to restore it.
