|
@@ -559,6 +559,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
|
|
|
struct device *dev = &urb->dev->dev;
|
|
|
int ret = 0;
|
|
|
unsigned long flags;
|
|
|
+ struct vhci_device *vdev;
|
|
|
|
|
|
usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n",
|
|
|
hcd, urb, mem_flags);
|
|
@@ -574,6 +575,18 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
|
|
|
return urb->status;
|
|
|
}
|
|
|
|
|
|
+ vdev = port_to_vdev(the_controller->pending_port);
|
|
|
+
|
|
|
+ /* refuse enqueue for dead connection */
|
|
|
+ spin_lock(&vdev->ud.lock);
|
|
|
+ if (vdev->ud.status == VDEV_ST_NULL || vdev->ud.status == VDEV_ST_ERROR) {
|
|
|
+ usbip_uerr("enqueue for inactive port %d\n", vdev->rhport);
|
|
|
+ spin_unlock(&vdev->ud.lock);
|
|
|
+ spin_unlock_irqrestore(&the_controller->lock, flags);
|
|
|
+ return -ENODEV;
|
|
|
+ }
|
|
|
+ spin_unlock(&vdev->ud.lock);
|
|
|
+
|
|
|
ret = usb_hcd_link_urb_to_ep(hcd, urb);
|
|
|
if (ret)
|
|
|
goto no_need_unlink;
|
|
@@ -592,8 +605,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
|
|
|
__u8 type = usb_pipetype(urb->pipe);
|
|
|
struct usb_ctrlrequest *ctrlreq =
|
|
|
(struct usb_ctrlrequest *) urb->setup_packet;
|
|
|
- struct vhci_device *vdev =
|
|
|
- port_to_vdev(the_controller->pending_port);
|
|
|
|
|
|
if (type != PIPE_CONTROL || !ctrlreq) {
|
|
|
dev_err(dev, "invalid request to devnum 0\n");
|