evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
[ 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) <shuah@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shuah Khan (Samsung OSG) 2018-05-29 16:13:03 -06:00 • committed by Greg Kroah-Hartman
parent 52941707f7
commit 3b14ad7ca7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/usb/usbip/src/usbip_detach.c
View file

@ -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;