Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+3
-1
+3
-1
kernel/stackleak.c
+3
-1
kernel/stackleak.c
···
11
11
*/
12
12
13
13
#include <linux/stackleak.h>
14
+
#include <linux/kprobes.h>
14
15
15
16
#ifdef CONFIG_STACKLEAK_RUNTIME_DISABLE
16
17
#include <linux/jump_label.h>
···
48
47
#define skip_erasing() false
49
48
#endif /* CONFIG_STACKLEAK_RUNTIME_DISABLE */
50
49
51
-
asmlinkage void stackleak_erase(void)
50
+
asmlinkage void notrace stackleak_erase(void)
52
51
{
53
52
/* It would be nice not to have 'kstack_ptr' and 'boundary' on stack */
54
53
unsigned long kstack_ptr = current->lowest_stack;
···
102
101
/* Reset the 'lowest_stack' value for the next syscall */
103
102
current->lowest_stack = current_top_of_stack() - THREAD_SIZE/64;
104
103
}
104
+
NOKPROBE_SYMBOL(stackleak_erase);
105
105
106
106
void __used stackleak_track_stack(void)
107
107
{