Merge branch 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2020 23:05:54 +0000 (16:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2020 23:05:54 +0000 (16:05 -0700)
commit1c3837266214c1e6fbbb96ff36bee13e923057d8
treedf8455bbecf61d15adb4466b920c28e847a593d3
parent3a8557e1aed0043d526f304a1f500108c8976b78
parentef9d965bc8b6fce5bcc0ae76a4a5b3ed91ee81eb
Merge branch 'work.sysctl' of git://git./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
drivers/cdrom/cdrom.c
drivers/char/random.c
fs/proc/proc_sysctl.c
include/linux/ftrace.h
net/core/sysctl_net_core.c