Commit 01446ef5 authored by Max Vozeler's avatar Max Vozeler Committed by Greg Kroah-Hartman

staging: usbip: vhci: use urb->dev->portnum to find port

The access to pending_port was racy when two devices
were being attached at the same time.
Signed-off-by: default avatarMax Vozeler <max@vozeler.com>
Tested-by: default avatarMark Wehby <MWehby@luxotticaRetail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bd65f623
...@@ -100,9 +100,6 @@ struct vhci_hcd { ...@@ -100,9 +100,6 @@ struct vhci_hcd {
* But, the index of this array begins from 0. * But, the index of this array begins from 0.
*/ */
struct vhci_device vdev[VHCI_NPORTS]; struct vhci_device vdev[VHCI_NPORTS];
/* vhci_device which has not been assiged its address yet */
int pending_port;
}; };
......
...@@ -138,8 +138,6 @@ void rh_port_connect(int rhport, enum usb_device_speed speed) ...@@ -138,8 +138,6 @@ void rh_port_connect(int rhport, enum usb_device_speed speed)
* the_controller->vdev[rhport].ud.status = VDEV_CONNECT; * the_controller->vdev[rhport].ud.status = VDEV_CONNECT;
* spin_unlock(&the_controller->vdev[rhport].ud.lock); */ * spin_unlock(&the_controller->vdev[rhport].ud.lock); */
the_controller->pending_port = rhport;
spin_unlock_irqrestore(&the_controller->lock, flags); spin_unlock_irqrestore(&the_controller->lock, flags);
usb_hcd_poll_rh_status(vhci_to_hcd(the_controller)); usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));
...@@ -575,7 +573,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, ...@@ -575,7 +573,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
return urb->status; return urb->status;
} }
vdev = port_to_vdev(the_controller->pending_port); vdev = port_to_vdev(urb->dev->portnum-1);
/* refuse enqueue for dead connection */ /* refuse enqueue for dead connection */
spin_lock(&vdev->ud.lock); spin_lock(&vdev->ud.lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment