summaryrefslogtreecommitdiff
path: root/tools/testing
diff options
context:
space:
mode:
authorDave Hansen <dave.hansen@linux.intel.com>2017-02-03 10:51:35 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-28 18:39:25 +0200
commit26e9852f9d50945c7a3b245143eed8f7004cdaed (patch)
treec273e1104d2e7904beb4d930fd50b353e2965790 /tools/testing
parent1e0fc7dba23d8ecf8baee8ccf8440503f7013221 (diff)
selftests, x86, protection_keys: fix wrong offset in siginfo
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>
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/x86/protection_keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c
index 2842a5fa22b3..17c7d5833ccf 100644
--- 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 *write_to_me)
#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