Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c49c2d authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey' 



'si_pkey' is now #defined to be the name of the new siginfo field that
protection keys uses.  Rename it not to conflict.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171111001231.DFFC8285@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a6400120

tools/testing/selftests/x86/protection_keys.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -250,7 +250,7 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) 
	unsigned long ip;

	unsigned long ip;

	char *fpregs;

	char *fpregs;

	u32 *pkru_ptr;

	u32 *pkru_ptr;

	u64 si_pkey;

	u64 siginfo_pkey;

	u32 *si_pkey_ptr;

	u32 *si_pkey_ptr;

	int pkru_offset;

	int pkru_offset;

	fpregset_t fpregset;

	fpregset_t fpregset;
@@ -292,9 +292,9 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) 
	si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset);

	si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset);

	dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr);

	dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr);

	dump_mem(si_pkey_ptr - 8, 24);

	dump_mem(si_pkey_ptr - 8, 24);

	si_pkey = *si_pkey_ptr;

	siginfo_pkey = *si_pkey_ptr;

	pkey_assert(si_pkey < NR_PKEYS);

	pkey_assert(siginfo_pkey < NR_PKEYS);

	last_si_pkey = si_pkey;

	last_si_pkey = siginfo_pkey;





	if ((si->si_code == SEGV_MAPERR) ||

	if ((si->si_code == SEGV_MAPERR) ||

	    (si->si_code == SEGV_ACCERR) ||

	    (si->si_code == SEGV_ACCERR) ||
@@ -306,7 +306,7 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext) 
	dprintf1("signal pkru from xsave: %08x\n", *pkru_ptr);

	dprintf1("signal pkru from xsave: %08x\n", *pkru_ptr);

	/* need __rdpkru() version so we do not do shadow_pkru checking */

	/* need __rdpkru() version so we do not do shadow_pkru checking */

	dprintf1("signal pkru from  pkru: %08x\n", __rdpkru());

	dprintf1("signal pkru from  pkru: %08x\n", __rdpkru());

	dprintf1("si_pkey from siginfo: %jx\n", si_pkey);

	dprintf1("pkey from siginfo: %jx\n", siginfo_pkey);

	*(u64 *)pkru_ptr = 0x00000000;

	*(u64 *)pkru_ptr = 0x00000000;

	dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n");

	dprintf1("WARNING: set PRKU=0 to allow faulting instruction to continue\n");

	pkru_faults++;

	pkru_faults++;