Commit d179f99a authored May 29, 2018 by Shuah Khan (Samsung OSG) Committed by Greg Kroah-Hartman May 31, 2018

usbip: usbip_detach: Fix memory, udev context and udev leak

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) <shuah@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent edf38004

tools/usb/usbip/src/usbip_detach.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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];

		@@ -73,9 +73,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;