4.14-stable patches

added patches:
	x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index a6809a6e7fbdd087eff4fe4bbb3958bfffc3a6bb..d04f756beb00c4dcdbabec6a46cd0d4e01308f0d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -95,3 +95,4 @@ staging-android-ion-zero-cma-allocated-memory.patch
 staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch
 usb-xhci-disable-slot-even-when-virt-dev-is-null.patch
 usb-xhci-fix-potential-memory-leak-in-xhci_disable_slot.patch
+x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch

diff --git a/queue-4.14/x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch b/queue-4.14/x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch
new file mode 100644 (file)
index 0000000..0afe7ac
--- /dev/null
+++ b/queue-4.14/x86-pkeys-selftests-rename-si_pkey-to-siginfo_pkey.patch
@@ -0,0 +1,63 @@
+From 91c49c2deb96ffc3c461eaae70219d89224076b7 Mon Sep 17 00:00:00 2001
+From: Dave Hansen <dave.hansen@linux.intel.com>
+Date: Fri, 10 Nov 2017 16:12:31 -0800
+Subject: x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'
+
+From: Dave Hansen <dave.hansen@linux.intel.com>
+
+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.
+
+Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
+Acked-by: Thomas 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: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/testing/selftests/x86/protection_keys.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/tools/testing/selftests/x86/protection_keys.c
++++ b/tools/testing/selftests/x86/protection_keys.c
+@@ -250,7 +250,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;
+@@ -292,9 +292,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) ||
+@@ -306,7 +306,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++;