diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-30 18:36:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-30 18:36:30 -0800 |
| commit | 1f817429b2ddc08f5c92a5b83d0f303f1e0d1bd4 (patch) | |
| tree | 43d5a324441994e29132fe5252c21bf08a757884 /kernel | |
| parent | fd3b3e0ec59db813d3ff665e158b1390ecdcfd14 (diff) | |
| parent | ef1a8409348966f0b25ff97a170d6d0367710ea9 (diff) | |
| download | linux-1f817429b2ddc08f5c92a5b83d0f303f1e0d1bd4.tar.gz | |
Merge tag 'gcc-plugins-v4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull stackleak plugin fix from Kees Cook: "Fix crash by not allowing kprobing of stackleak_erase() (Alexander Popov)" * tag 'gcc-plugins-v4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: stackleak: Disable function tracing and kprobes for stackleak_erase()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/stackleak.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/stackleak.c b/kernel/stackleak.c index e42892926244..08cb57eed389 100644 --- a/kernel/stackleak.c +++ b/kernel/stackleak.c @@ -11,6 +11,7 @@ */ #include <linux/stackleak.h> +#include <linux/kprobes.h> #ifdef CONFIG_STACKLEAK_RUNTIME_DISABLE #include <linux/jump_label.h> @@ -47,7 +48,7 @@ int stack_erasing_sysctl(struct ctl_table *table, int write, #define skip_erasing() false #endif /* CONFIG_STACKLEAK_RUNTIME_DISABLE */ -asmlinkage void stackleak_erase(void) +asmlinkage void notrace stackleak_erase(void) { /* It would be nice not to have 'kstack_ptr' and 'boundary' on stack */ unsigned long kstack_ptr = current->lowest_stack; @@ -101,6 +102,7 @@ asmlinkage void stackleak_erase(void) /* Reset the 'lowest_stack' value for the next syscall */ current->lowest_stack = current_top_of_stack() - THREAD_SIZE/64; } +NOKPROBE_SYMBOL(stackleak_erase); void __used stackleak_track_stack(void) { |