Patch "selftests, x86, protection_keys: fix wrong offset in siginfo" has been added to the 4.9-stable tree

Patch "selftests, x86, protection_keys: fix wrong offset in siginfo" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    selftests, x86, protection_keys: fix wrong offset in siginfo

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:
     selftests-x86-protection_keys-fix-wrong-offset-in-siginfo.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 <stable@vger.kernel.org> know about it.


>From 2195bff041486eb7fcceaf058acaedcd057efbdc Mon Sep 17 00:00:00 2001
From: Dave Hansen <dave.hansen@linux.intel.com>
Date: Fri, 3 Feb 2017 10:51:35 -0800
Subject: selftests, x86, protection_keys: fix wrong offset in siginfo

From: Dave Hansen <dave.hansen@linux.intel.com>

commit 2195bff041486eb7fcceaf058acaedcd057efbdc upstream.

The siginfo contains a bunch of information about the fault.
For protection keys, it tells us which protection key's
permissions were violated.

The wrong offset in here leads to reading garbage and thus
failures in the tests.

We should probably eventually move this over to using the
kernel's headers defining the siginfo instead of a hard-coded
offset.  But, for now, just do the simplest fix.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 tools/testing/selftests/x86/protection_keys.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/tools/testing/selftests/x86/protection_keys.c
+++ b/tools/testing/selftests/x86/protection_keys.c
@@ -192,7 +192,7 @@ void lots_o_noops_around_write(int *writ
 #define SYS_pkey_alloc	 381
 #define SYS_pkey_free	 382
 #define REG_IP_IDX REG_EIP
-#define si_pkey_offset 0x18
+#define si_pkey_offset 0x14
 #else
 #define SYS_mprotect_key 329
 #define SYS_pkey_alloc	 330


Patches currently in stable-queue which might be from dave.hansen@linux.intel.com 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