x86/pkeys/selftests: Fix pointer math

We dump out the entire area of the siginfo where the si_pkey_ptr is
supposed to be. But, we do some math on the poitner, which is a u32.
We intended to do byte math, not u32 math on the pointer.

Cast it over to a u8* so it works.

Also, move this block of code to below th si_code check. It doesn't
hurt anything, but the si_pkey field is gibberish for other signal
types.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Ellermen <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ram Pai <linuxram@us.ibm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20180509171352.9BE09819@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by Dave Hansen and committed by Ingo Molnar 3d64f4ed 0a0b1520

+7 -7
+7 -7
tools/testing/selftests/x86/protection_keys.c
··· 303 303 dump_mem(pkru_ptr - 128, 256); 304 304 pkey_assert(*pkru_ptr); 305 305 306 - si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset); 307 - dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr); 308 - dump_mem(si_pkey_ptr - 8, 24); 309 - siginfo_pkey = *si_pkey_ptr; 310 - pkey_assert(siginfo_pkey < NR_PKEYS); 311 - last_si_pkey = siginfo_pkey; 312 - 313 306 if ((si->si_code == SEGV_MAPERR) || 314 307 (si->si_code == SEGV_ACCERR) || 315 308 (si->si_code == SEGV_BNDERR)) { 316 309 printf("non-PK si_code, exiting...\n"); 317 310 exit(4); 318 311 } 312 + 313 + si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset); 314 + dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr); 315 + dump_mem((u8 *)si_pkey_ptr - 8, 24); 316 + siginfo_pkey = *si_pkey_ptr; 317 + pkey_assert(siginfo_pkey < NR_PKEYS); 318 + last_si_pkey = siginfo_pkey; 319 319 320 320 dprintf1("signal pkru from xsave: %08x\n", *pkru_ptr); 321 321 /* need __rdpkru() version so we do not do shadow_pkru checking */