leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace: fix an incorrect __user annotation on stack_trace_sysctl

Browse Source 
No user pointers for sysctls anymore.

Fixes: 32927393dc ("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>
This commit is contained in:
Christoph Hellwig
2020-06-03 07:52:37 +02:00
committed by Al Viro
parent a2541dcb51
commit 7ff0d4490e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/ftrace.h
View File

@@ -319,9 +319,8 @@ static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs,
extern int stack_tracer_enabled; extern int stack_tracer_enabled;
int stack_trace_sysctl(struct ctl_table *table, int write, int stack_trace_sysctl(struct ctl_table *table, int write, void *buffer,
void __user *buffer, size_t *lenp, size_t *lenp, loff_t *ppos);
loff_t *ppos);
/* DO NOT MODIFY THIS VARIABLE DIRECTLY! */ /* DO NOT MODIFY THIS VARIABLE DIRECTLY! */
DECLARE_PER_CPU(int, disable_stack_tracer); DECLARE_PER_CPU(int, disable_stack_tracer);

5
kernel/trace/trace_stack.c
View File

@@ -515,9 +515,8 @@ static const struct file_operations stack_trace_filter_fops = {
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
int int
stack_trace_sysctl(struct ctl_table *table, int write, stack_trace_sysctl(struct ctl_table *table, int write, void *buffer,
void __user *buffer, size_t *lenp, size_t *lenp, loff_t *ppos)
loff_t *ppos)
{ {
int was_enabled; int was_enabled;
int ret; int ret;