From: Shuah Khan (Samsung OSG) Date: Mon, 30 Apr 2018 22:17:19 +0000 (-0600) Subject: usbip: usbip_host: delete device from busid_table after rebind X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf3bcc3231ade09dd2733ca7d0f34d90ee7fe8fd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git usbip: usbip_host: delete device from busid_table after rebind commit 1e180f167d4e413afccbbb4a421b48b2de832549 upstream. Device is left in the busid_table after unbind and rebind. Rebind initiates usb bus scan and the original driver claims the device. After rescan the device should be deleted from the busid_table as it no longer belongs to usbip_host. Fix it to delete the device after device_attach() succeeds. Signed-off-by: Shuah Khan (Samsung OSG) Cc: stable Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c index b59a253a8479..bfc8b32253ae 100644 --- a/drivers/usb/usbip/stub_main.c +++ b/drivers/usb/usbip/stub_main.c @@ -200,6 +200,9 @@ static ssize_t rebind_store(struct device_driver *dev, const char *buf, if (!bid) return -ENODEV; + /* mark the device for deletion so probe ignores it during rescan */ + bid->status = STUB_BUSID_OTHER; + /* device_attach() callers should hold parent lock for USB */ if (bid->udev->dev.parent) device_lock(bid->udev->dev.parent); @@ -211,6 +214,9 @@ static ssize_t rebind_store(struct device_driver *dev, const char *buf, return ret; } + /* delete device from busid_table */ + del_match_busid((char *) buf); + return count; }