Patch "x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
91c49c2deb96ffc3c461eaae70219d89224076b7Mon Sep 17 00:00:00 2001
From: Dave Hansen <[email protected]>
Date: Fri, 10 Nov 2017 16:12:31 -0800
Subject: x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'
From: Dave Hansen <[email protected]>
commit 91c49c2deb96ffc3c461eaae70219d89224076b7 upstream.
'si_pkey' is now #defined to be the name of the new siginfo field that protection keys uses. Rename it not to conflict.
--- tools/testing/selftests/x86/protection_keys.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/x86/protection_keys.c +5 -5
@@ -249,7 +249,7 @@ void signal_handler(int signum, siginfo_unsigned long ip;char *fpregs;u32 *pkru_ptr; -u64 si_pkey; +u64 siginfo_pkey;u32 *si_pkey_ptr;int pkru_offset;fpregset_t fpregset;
@@ -291,9 +291,9 @@ void signal_handler(int signum, siginfo_ si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset);dprintf1 ("si_pkey_ptr: %p\n" , si_pkey_ptr);dump_mem (si_pkey_ptr -8 ,24 ); - si_pkey = *si_pkey_ptr; -pkey_assert (si_pkey <NR_PKEYS ); - last_si_pkey = si_pkey; + siginfo_pkey = *si_pkey_ptr; +pkey_assert (siginfo_pkey <NR_PKEYS ); + last_si_pkey = siginfo_pkey; if ((si->si_code == SEGV_MAPERR) || (si->si_code == SEGV_ACCERR) ||
@@ -305,7 +305,7 @@ void signal_handler(int signum, siginfo_dprintf1 ("signal pkru from xsave: %08x\n" , *pkru_ptr);/* need __rdpkru() version so we do not do shadow_pkru checking */ 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 ;dprintf1 ("WARNING: set PRKU=0 to allow faulting instruction to continue\n" ); pkru_faults++;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch queue-4.9/signal-testing-don-t-look-for-__si_fault-in-userspace.patch queue-4.9/selftests-x86-protection_keys-fix-wrong-offset-in-siginfo.patch