summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-02 14:59:38 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-06 08:25:24 -0500
commitabb0f6a79fe8eba7982b73313b8623259d78c3f6 (patch)
tree3eacfcd16860ed1edd9190a30a8670f5c4ea9266 /drivers/cdrom
parent820351f05be93623c6e71b5d618f90f0deebc134 (diff)
downloadlinux-stable-abb0f6a79fe8eba7982b73313b8623259d78c3f6.tar.gz
linux-stable-abb0f6a79fe8eba7982b73313b8623259d78c3f6.tar.bz2
linux-stable-abb0f6a79fe8eba7982b73313b8623259d78c3f6.zip
cdrom: don't open-code memdup_user()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/cdrom.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index c206ccda899b..1b257ea9776a 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3186,15 +3186,11 @@ static noinline int mmc_ioctl_dvd_read_struct(struct cdrom_device_info *cdi,
if (!CDROM_CAN(CDC_DVD))
return -ENOSYS;
- s = kmalloc(size, GFP_KERNEL);
- if (!s)
- return -ENOMEM;
+ s = memdup_user(arg, size);
+ if (IS_ERR(s))
+ return PTR_ERR(s);
cd_dbg(CD_DO_IOCTL, "entering DVD_READ_STRUCT\n");
- if (copy_from_user(s, arg, size)) {
- kfree(s);
- return -EFAULT;
- }
ret = dvd_read_struct(cdi, s, cgc);
if (ret)