diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:05:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:05:54 -0700 |
| commit | 1c3837266214c1e6fbbb96ff36bee13e923057d8 (patch) | |
| tree | df8455bbecf61d15adb4466b920c28e847a593d3 /kernel | |
| parent | Merge branch 'uaccess.i915' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | sysctl: reject gigantic reads/write to sysctl files (diff) | |
| download | wireguard-linux-1c3837266214c1e6fbbb96ff36bee13e923057d8.tar.xz wireguard-linux-1c3837266214c1e6fbbb96ff36bee13e923057d8.zip | |
Merge branch 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull sysctl fixes from Al Viro:
"Fixups to regressions in sysctl series"
* 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
sysctl: reject gigantic reads/write to sysctl files
cdrom: fix an incorrect __user annotation on cdrom_sysctl_info
trace: fix an incorrect __user annotation on stack_trace_sysctl
random: fix an incorrect __user annotation on proc_do_entropy
net/sysctl: remove leftover __user annotations on neigh_proc_dointvec*
net/sysctl: use cpumask_parse in flow_limit_cpu_sysctl
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_stack.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; |