]>
Commit | Line | Data |
---|---|---|
d033d661 GKH |
1 | From f7d665627e103e82d34306c7d3f6f46f387c0d8b Mon Sep 17 00:00:00 2001 |
2 | From: David Howells <dhowells@redhat.com> | |
3 | Date: Wed, 27 Jul 2016 11:42:38 +0100 | |
4 | Subject: x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace | |
5 | ||
6 | From: David Howells <dhowells@redhat.com> | |
7 | ||
8 | commit f7d665627e103e82d34306c7d3f6f46f387c0d8b upstream. | |
9 | ||
10 | x86_64 needs to use compat_sys_keyctl for 32-bit userspace rather than | |
11 | calling sys_keyctl(). The latter will work in a lot of cases, thereby | |
12 | hiding the issue. | |
13 | ||
14 | Reported-by: Stephan Mueller <smueller@chronox.de> | |
15 | Tested-by: Stephan Mueller <smueller@chronox.de> | |
16 | Signed-off-by: David Howells <dhowells@redhat.com> | |
17 | Cc: Andy Lutomirski <luto@kernel.org> | |
18 | Cc: Borislav Petkov <bp@alien8.de> | |
19 | Cc: Brian Gerst <brgerst@gmail.com> | |
20 | Cc: Denys Vlasenko <dvlasenk@redhat.com> | |
21 | Cc: H. Peter Anvin <hpa@zytor.com> | |
22 | Cc: Josh Poimboeuf <jpoimboe@redhat.com> | |
23 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
24 | Cc: Peter Zijlstra <peterz@infradead.org> | |
25 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
26 | Cc: keyrings@vger.kernel.org | |
27 | Cc: linux-security-module@vger.kernel.org | |
28 | Link: http://lkml.kernel.org/r/146961615805.14395.5581949237156769439.stgit@warthog.procyon.org.uk | |
29 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
30 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
31 | ||
32 | --- | |
33 | arch/x86/entry/syscalls/syscall_32.tbl | 2 +- | |
34 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
35 | ||
36 | --- a/arch/x86/entry/syscalls/syscall_32.tbl | |
37 | +++ b/arch/x86/entry/syscalls/syscall_32.tbl | |
38 | @@ -294,7 +294,7 @@ | |
39 | # 285 sys_setaltroot | |
40 | 286 i386 add_key sys_add_key | |
41 | 287 i386 request_key sys_request_key | |
42 | -288 i386 keyctl sys_keyctl | |
43 | +288 i386 keyctl sys_keyctl compat_sys_keyctl | |
44 | 289 i386 ioprio_set sys_ioprio_set | |
45 | 290 i386 ioprio_get sys_ioprio_get | |
46 | 291 i386 inotify_init sys_inotify_init |