]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: cdc-wdm: use memdup_user
authorGeliang Tang <geliangtang@gmail.com>
Mon, 8 May 2017 15:14:39 +0000 (23:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2017 10:20:53 +0000 (12:20 +0200)
Use memdup_user() helper instead of open-coding to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/cdc-wdm.c

index 08669fee6d7f646c4a52816a9d240c441edd21bf..8f972247b1c1ac4d41faebe390a4c9ac9a308960 100644 (file)
@@ -361,17 +361,9 @@ static ssize_t wdm_write
        if (we < 0)
                return usb_translate_errors(we);
 
-       buf = kmalloc(count, GFP_KERNEL);
-       if (!buf) {
-               rv = -ENOMEM;
-               goto outnl;
-       }
-
-       r = copy_from_user(buf, buffer, count);
-       if (r > 0) {
-               rv = -EFAULT;
-               goto out_free_mem;
-       }
+       buf = memdup_user(buffer, count);
+       if (IS_ERR(buf))
+               return PTR_ERR(buf);
 
        /* concurrent writes and disconnect */
        r = mutex_lock_interruptible(&desc->wlock);
@@ -441,8 +433,7 @@ static ssize_t wdm_write
 
        usb_autopm_put_interface(desc->intf);
        mutex_unlock(&desc->wlock);
-outnl:
-       return rv < 0 ? rv : count;
+       return count;
 
 out_free_mem_pm:
        usb_autopm_put_interface(desc->intf);