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

Commit 6d212153 authored by Max Vozeler's avatar Max Vozeler Committed by Greg Kroah-Hartman
Browse files

staging: usbip: vhci: refuse to enqueue for dead connections 



There can be requests to enqueue URBs while we are shutting
down a connection.

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 b92a5e23

drivers/staging/usbip/vhci_hcd.c

+13 −2
Original line number Diff line number Diff line
@@ -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");