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

Commit 5936ac7f authored by David Vrabel's avatar David Vrabel Committed by Greg Kroah-Hartman
Browse files

WUSB: fix oops when completing URBs for disconnected devices 



Fix an oops in wusbhc_giveback_urb() if the wusb device had disconnected
while an urb was in progress. Also release the ref count obtained here.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8db324ec

drivers/usb/wusbcore/devconnect.c

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ static void wusbhc_devconnect_acked_work(struct work_struct *work) 
	mutex_lock(&wusbhc->mutex);

	wusbhc_devconnect_acked(wusbhc, wusb_dev);

	mutex_unlock(&wusbhc->mutex);



	wusb_dev_put(wusb_dev);

}



/*

drivers/usb/wusbcore/wusbhc.c

+4 −2
Original line number Diff line number Diff line
@@ -339,13 +339,15 @@ void wusbhc_giveback_urb(struct wusbhc *wusbhc, struct urb *urb, int status) 
{

	struct wusb_dev *wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev);



	if (status == 0) {

	if (status == 0 && wusb_dev) {

		wusb_dev->entry_ts = jiffies;



		/* wusbhc_devconnect_acked() can't be called from from

		/* wusbhc_devconnect_acked() can't be called from

		   atomic context so defer it to a work queue. */

		if (!list_empty(&wusb_dev->cack_node))

			queue_work(wusbd, &wusb_dev->devconnect_acked_work);

		else

			wusb_dev_put(wusb_dev);

	}



	usb_hcd_giveback_urb(&wusbhc->usb_hcd, urb, status);