usbip: usbip_host: delete device from busid_table after rebind
authorShuah Khan (Samsung OSG) <shuah@kernel.org>
Mon, 30 Apr 2018 22:17:19 +0000 (16:17 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 May 2018 16:53:55 +0000 (18:53 +0200)
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) <shuah@kernel.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/usbip/stub_main.c

index b59a253a8479dbbb97a5604e7402b87f57a3cd71..bfc8b32253ae81fb5cf74de2662477d59fb5a980 100644 (file)
@@ -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;
 }