summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-10 16:05:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-10 16:05:54 -0700
commit1c3837266214c1e6fbbb96ff36bee13e923057d8 (patch)
treedf8455bbecf61d15adb4466b920c28e847a593d3 /drivers/cdrom
parent3a8557e1aed0043d526f304a1f500108c8976b78 (diff)
parentef9d965bc8b6fce5bcc0ae76a4a5b3ed91ee81eb (diff)
downloadlinux-1c3837266214c1e6fbbb96ff36bee13e923057d8.tar.gz
linux-1c3837266214c1e6fbbb96ff36bee13e923057d8.tar.bz2
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 'drivers/cdrom')
-rw-r--r--drivers/cdrom/cdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index a0a7ae705de8..d82b3b7658bd 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3535,7 +3535,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
}
static int cdrom_sysctl_info(struct ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+ void *buffer, size_t *lenp, loff_t *ppos)
{
int pos;
char *info = cdrom_sysctl_settings.info;