kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usbip: usbip_host: delete device from busid_table after rebind

Browse source 
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@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shuah Khan (Samsung OSG) 2018-04-30 16:17:19 -06:00 committed by Greg Kroah-Hartman
parent 28b68acc4a
commit 1e180f167d
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/usbip/stub_main.c
View file

@ -186,6 +186,9 @@ static ssize_t rebind_store(struct device_driver *dev, const char *buf,
if (!bid) if (!bid)
return -ENODEV; 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 */ /* device_attach() callers should hold parent lock for USB */
if (bid->udev->dev.parent) if (bid->udev->dev.parent)
device_lock(bid->udev->dev.parent); device_lock(bid->udev->dev.parent);
@ -197,6 +200,9 @@ static ssize_t rebind_store(struct device_driver *dev, const char *buf,
return ret; return ret;
} }
/* delete device from busid_table */
del_match_busid((char *) buf);
return count; return count;
} }