[PATCH 3.18 13/85] usbip: usbip_detach: Fix memory, udev context and udev leak

[Greg Kroah-Hartman]

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: "Shuah Khan (Samsung OSG)" <sh...@kernel.org>

[ Upstream commit d179f99a651685b19333360e6558110da2fe9bd7 ]

detach_port() fails to call usbip_vhci_driver_close() from its error
path after usbip_vhci_detach_device() returns failure, leaking memory
allocated in usbip_vhci_driver_open() and holding udev_context and udev
references. Fix it to call usbip_vhci_driver_close().

Signed-off-by: Shuah Khan (Samsung OSG) <sh...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 tools/usb/usbip/src/usbip_detach.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- a/tools/usb/usbip/src/usbip_detach.c
+++ b/tools/usb/usbip/src/usbip_detach.c
@@ -43,7 +43,7 @@ void usbip_detach_usage(void)
 
 static int detach_port(char *port)
 {
-       int ret;
+       int ret = 0;
        uint8_t portnum;
        char path[PATH_MAX+1];
 
@@ -71,9 +71,12 @@ static int detach_port(char *port)
        }
 
        ret = usbip_vhci_detach_device(portnum);
-       if (ret < 0)
-               return -1;
+       if (ret < 0) {
+               ret = -1;
+               goto call_driver_close;
+       }
 
+call_driver_close:
        usbip_vhci_driver_close();
 
        return ret;