Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/usbip/vhci.h

+0 −3
Original line number Diff line number Diff line
@@ -100,9 +100,6 @@ struct vhci_hcd { 
	 * But, the index of this array begins from 0.

	 */

	struct vhci_device vdev[VHCI_NPORTS];



	/* vhci_device which has not been assiged its address yet */

	int pending_port;

};

drivers/staging/usbip/vhci_hcd.c

+1 −3
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ void rh_port_connect(int rhport, enum usb_device_speed speed) 
	 * the_controller->vdev[rhport].ud.status = VDEV_CONNECT;

	 * spin_unlock(&the_controller->vdev[rhport].ud.lock); */



	the_controller->pending_port = rhport;



	spin_unlock_irqrestore(&the_controller->lock, flags);



	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, 
		return urb->status;

	}



	vdev = port_to_vdev(the_controller->pending_port);

	vdev = port_to_vdev(urb->dev->portnum-1);



	/* refuse enqueue for dead connection */

	spin_lock(&vdev->ud.lock);