summaryrefslogtreecommitdiffstats
path: root/drivers/staging/usbip
diff options
context:
space:
mode:
authorHeinrich Schuchardt2014-02-27 14:25:19 +0100
committerGreg Kroah-Hartman2014-02-28 23:18:29 +0100
commit696c9c7ffaeaeee5c9711f35503ab46ff3e1255e (patch)
treee95e98d13ee74a21f6e9abeef967934288df10d0 /drivers/staging/usbip
parentstaging: echo: move to drivers/misc/ (diff)
downloadkernel-qcow2-linux-696c9c7ffaeaeee5c9711f35503ab46ff3e1255e.tar.gz
kernel-qcow2-linux-696c9c7ffaeaeee5c9711f35503ab46ff3e1255e.tar.xz
kernel-qcow2-linux-696c9c7ffaeaeee5c9711f35503ab46ff3e1255e.zip
staging: usbip: userspace: Memory leak in usbip_exported_device_new
Memory was leaked and a device not closed if we ran out of memory on the system. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/usbip')
-rw-r--r--drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
index 86a867582de6..35b2f5b0e350 100644
--- a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
+++ b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
@@ -101,6 +101,7 @@ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
static struct usbip_exported_device *usbip_exported_device_new(char *sdevpath)
{
struct usbip_exported_device *edev = NULL;
+ struct usbip_exported_device *edev_old;
size_t size;
int i;
@@ -126,8 +127,10 @@ static struct usbip_exported_device *usbip_exported_device_new(char *sdevpath)
size = sizeof(*edev) + edev->udev.bNumInterfaces *
sizeof(struct usbip_usb_interface);
+ edev_old = edev;
edev = realloc(edev, size);
if (!edev) {
+ edev = edev_old;
dbg("realloc failed");
goto err;
}