From: Heinrich Schuchardt Date: Thu, 27 Feb 2014 13:25:19 +0000 (+0100) Subject: staging: usbip: userspace: Memory leak in usbip_exported_device_new X-Git-Tag: next-20140306~21^2~88 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=696c9c7ffaeaeee5c9711f35503ab46ff3e1255e;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- 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; }