1 From 6be390fe5b1a7e9480e9cf0f85777a8eb205ad08 Mon Sep 17 00:00:00 2001
2 From: Andy Lutomirski <luto@kernel.org>
3 Date: Sat, 4 Nov 2017 04:19:48 -0700
4 Subject: [PATCH 112/233] selftests/x86/protection_keys: Fix syscall NR
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
12 On new enough glibc, the pkey syscalls numbers are available. Check
13 first before defining them to avoid warnings like:
15 protection_keys.c:198:0: warning: "SYS_pkey_alloc" redefined
17 Signed-off-by: Andy Lutomirski <luto@kernel.org>
18 Cc: Borislav Petkov <bpetkov@suse.de>
19 Cc: Dave Hansen <dave.hansen@intel.com>
20 Cc: Linus Torvalds <torvalds@linux-foundation.org>
21 Cc: Peter Zijlstra <peterz@infradead.org>
22 Cc: Thomas Gleixner <tglx@linutronix.de>
23 Cc: stable@vger.kernel.org
24 Link: http://lkml.kernel.org/r/1fbef53a9e6befb7165ff855fc1a7d4788a191d6.1509794321.git.luto@kernel.org
25 Signed-off-by: Ingo Molnar <mingo@kernel.org>
26 (cherry picked from commit 693cb5580fdb026922363aa103add64b3ecd572e)
27 Signed-off-by: Andy Whitcroft <apw@canonical.com>
28 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
29 (cherry picked from commit 64c8ec4beb84ca8b0ff3250a8b6044d06be6315b)
30 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
32 tools/testing/selftests/x86/protection_keys.c | 24 ++++++++++++++++++------
33 1 file changed, 18 insertions(+), 6 deletions(-)
35 diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c
36 index 3237bc010e1c..3c54d5c40952 100644
37 --- a/tools/testing/selftests/x86/protection_keys.c
38 +++ b/tools/testing/selftests/x86/protection_keys.c
39 @@ -188,17 +188,29 @@ void lots_o_noops_around_write(int *write_to_me)
43 -#define SYS_mprotect_key 380
44 -#define SYS_pkey_alloc 381
45 -#define SYS_pkey_free 382
47 +#ifndef SYS_mprotect_key
48 +# define SYS_mprotect_key 380
50 +#ifndef SYS_pkey_alloc
51 +# define SYS_pkey_alloc 381
52 +# define SYS_pkey_free 382
54 #define REG_IP_IDX REG_EIP
55 #define si_pkey_offset 0x14
58 -#define SYS_mprotect_key 329
59 -#define SYS_pkey_alloc 330
60 -#define SYS_pkey_free 331
62 +#ifndef SYS_mprotect_key
63 +# define SYS_mprotect_key 329
65 +#ifndef SYS_pkey_alloc
66 +# define SYS_pkey_alloc 330
67 +# define SYS_pkey_free 331
69 #define REG_IP_IDX REG_RIP
70 #define si_pkey_offset 0x20
74 void dump_mem(void *dumpme, int len_bytes)