diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-06-03 07:52:37 +0200 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2020-06-08 10:13:56 -0400 |
| commit | 7ff0d4490ebadae8037a079a70c5cac13385a808 (patch) | |
| tree | d69d20180f5247f90e4beb9ecb3d57729c6f7751 | |
| parent | random: fix an incorrect __user annotation on proc_do_entropy (diff) | |
| download | wireguard-linux-7ff0d4490ebadae8037a079a70c5cac13385a808.tar.xz wireguard-linux-7ff0d4490ebadae8037a079a70c5cac13385a808.zip | |
trace: fix an incorrect __user annotation on stack_trace_sysctl
No user pointers for sysctls anymore.
Fixes: 32927393dc1c ("sysctl: pass kernel pointers to ->proc_handler")
Reported-by: build test robot <lkp@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | include/linux/ftrace.h | 5 | ||||
| -rw-r--r-- | kernel/trace/trace_stack.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index ddfc377de0d2..fce81238f304 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -319,9 +319,8 @@ static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs, extern int stack_tracer_enabled; -int stack_trace_sysctl(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, - loff_t *ppos); +int stack_trace_sysctl(struct ctl_table *table, int write, void *buffer, + size_t *lenp, loff_t *ppos); /* DO NOT MODIFY THIS VARIABLE DIRECTLY! */ DECLARE_PER_CPU(int, disable_stack_tracer); diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index c557f42a9397..98bba4764c52 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -515,9 +515,8 @@ static const struct file_operations stack_trace_filter_fops = { #endif /* CONFIG_DYNAMIC_FTRACE */ int -stack_trace_sysctl(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, - loff_t *ppos) +stack_trace_sysctl(struct ctl_table *table, int write, void *buffer, + size_t *lenp, loff_t *ppos) { int was_enabled; int ret; |