aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Kiener <guido.kiener@rohde-schwarz.com>2018-09-24 19:30:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-28 09:12:08 -0400
commit100f2cdeadffb3e63121d1d59a60a9882258c415 (patch)
treed63c1b075ce7ced0c363537d0bdf181357fd2877
parent4d2a863fe9b952d7147bd169d54062e71f343415 (diff)
usb: usbtmc: Fix memory leak in usbtmc_ioctl_request
Kernel memory is allocated twice in new function usbtmc_ioctl_request and creates a memory leak. This fix removes the superfluous kmalloc(). Signed-off-by: Guido Kiener <guido.kiener@rohde-schwarz.com> Fixes: 658f24f4523e ("usb: usbtmc: Add ioctl for generic requests on control") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/usbtmc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 0fcb81a1399b..dfbcf418dad7 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1895,10 +1895,6 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
1895 if (res) 1895 if (res)
1896 return -EFAULT; 1896 return -EFAULT;
1897 1897
1898 buffer = kmalloc(request.req.wLength, GFP_KERNEL);
1899 if (!buffer)
1900 return -ENOMEM;
1901
1902 if (request.req.wLength > USBTMC_BUFSIZE) 1898 if (request.req.wLength > USBTMC_BUFSIZE)
1903 return -EMSGSIZE; 1899 return -EMSGSIZE;
1904 1900