diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-18 05:31:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-18 05:31:20 -0800 |
| commit | 3c52c85809056b939488700a8fe0a54b3beaae8c (patch) | |
| tree | 9d202cdc050a5f82eb71f3f6aaec94b91ed1e544 /drivers/usb | |
| parent | baf9ce1b3502ab95aaa874a6f66aef1639f621e8 (diff) | |
| parent | 489ce6427ffe58b75f61f2fad55d4ad937e567c1 (diff) | |
Merge "USB: gadget: mbim: Avoid copying uninitialized data to userspace"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/f_mbim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_mbim.c b/drivers/usb/gadget/function/f_mbim.c index cdbac89d8734..e7c3278f66d4 100644 --- a/drivers/usb/gadget/function/f_mbim.c +++ b/drivers/usb/gadget/function/f_mbim.c @@ -2027,7 +2027,7 @@ static long mbim_ioctl(struct file *fp, unsigned cmd, unsigned long arg) default: ret = -ENODEV; pr_err("unknown transport\n"); - break; + goto fail; } ret = copy_to_user((void __user *)arg, &info, @@ -2043,6 +2043,7 @@ static long mbim_ioctl(struct file *fp, unsigned cmd, unsigned long arg) ret = -EINVAL; } +fail: mbim_unlock(&mbim->ioctl_excl); return ret; |