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

Commit 2c248f92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some small USB fixes that have been in linux-next this past
  week for 5.3-rc7

  They fix the usual xhci, syzbot reports, and other small issues that
  have come up last week.

  All have been in linux-next with no reported issues"

* tag 'usb-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: cdc-wdm: fix race between write and disconnect due to flag abuse
  usb: host: xhci: rcar: Fix typo in compatible string matching
  usb: host: xhci-tegra: Set DMA mask correctly
  USB: storage: ums-realtek: Whitelist auto-delink support
  USB: storage: ums-realtek: Update module parameter description for auto_delink_en
  usb: host: ohci: fix a race condition between shutdown and irq
  usb: hcd: use managed device resources
  typec: tcpm: fix a typo in the comparison of pdo_max_voltage
  usb-storage: Add new JMS567 revision to unusual_devs
  usb: chipidea: udc: don't do hardware access if gadget has stopped
  usbtmc: more sanity checking for packet size
  usb: udc: lpc32xx: silence fall-through warning
parents 345464fb 1426bd2c

drivers/usb/chipidea/udc.c

+24 −8
Original line number Diff line number Diff line
@@ -709,12 +709,6 @@ static int _gadget_stop_activity(struct usb_gadget *gadget) 
	struct ci_hdrc    *ci = container_of(gadget, struct ci_hdrc, gadget);

	unsigned long flags;



	spin_lock_irqsave(&ci->lock, flags);

	ci->gadget.speed = USB_SPEED_UNKNOWN;

	ci->remote_wakeup = 0;

	ci->suspended = 0;

	spin_unlock_irqrestore(&ci->lock, flags);



	/* flush all endpoints */

	gadget_for_each_ep(ep, gadget) {

		usb_ep_fifo_flush(ep);
@@ -732,6 +726,12 @@ static int _gadget_stop_activity(struct usb_gadget *gadget) 
		ci->status = NULL;

	}



	spin_lock_irqsave(&ci->lock, flags);

	ci->gadget.speed = USB_SPEED_UNKNOWN;

	ci->remote_wakeup = 0;

	ci->suspended = 0;

	spin_unlock_irqrestore(&ci->lock, flags);



	return 0;

}
@@ -1303,6 +1303,10 @@ static int ep_disable(struct usb_ep *ep) 
		return -EBUSY;



	spin_lock_irqsave(hwep->lock, flags);

	if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {

		spin_unlock_irqrestore(hwep->lock, flags);

		return 0;

	}



	/* only internal SW should disable ctrl endpts */
@@ -1392,6 +1396,10 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req, 
		return -EINVAL;



	spin_lock_irqsave(hwep->lock, flags);

	if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {

		spin_unlock_irqrestore(hwep->lock, flags);

		return 0;

	}

	retval = _ep_queue(ep, req, gfp_flags);

	spin_unlock_irqrestore(hwep->lock, flags);

	return retval;
@@ -1415,7 +1423,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) 
		return -EINVAL;



	spin_lock_irqsave(hwep->lock, flags);



	if (hwep->ci->gadget.speed != USB_SPEED_UNKNOWN)

		hw_ep_flush(hwep->ci, hwep->num, hwep->dir);



	list_for_each_entry_safe(node, tmpnode, &hwreq->tds, td) {
@@ -1487,6 +1495,10 @@ static void ep_fifo_flush(struct usb_ep *ep) 
	}



	spin_lock_irqsave(hwep->lock, flags);

	if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {

		spin_unlock_irqrestore(hwep->lock, flags);

		return;

	}



	hw_ep_flush(hwep->ci, hwep->num, hwep->dir);
@@ -1559,6 +1571,10 @@ static int ci_udc_wakeup(struct usb_gadget *_gadget) 
	int ret = 0;



	spin_lock_irqsave(&ci->lock, flags);

	if (ci->gadget.speed == USB_SPEED_UNKNOWN) {

		spin_unlock_irqrestore(&ci->lock, flags);

		return 0;

	}

	if (!ci->remote_wakeup) {

		ret = -EOPNOTSUPP;

		goto out;

drivers/usb/class/cdc-wdm.c

+12 −4
Original line number Diff line number Diff line
@@ -587,10 +587,20 @@ static int wdm_flush(struct file *file, fl_owner_t id) 
{

	struct wdm_device *desc = file->private_data;



	wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags));

	wait_event(desc->wait,

			/*

			 * needs both flags. We cannot do with one

			 * because resetting it would cause a race

			 * with write() yet we need to signal

			 * a disconnect

			 */

			!test_bit(WDM_IN_USE, &desc->flags) ||

			test_bit(WDM_DISCONNECTING, &desc->flags));



	/* cannot dereference desc->intf if WDM_DISCONNECTING */

	if (desc->werr < 0 && !test_bit(WDM_DISCONNECTING, &desc->flags))

	if (test_bit(WDM_DISCONNECTING, &desc->flags))

		return -ENODEV;

	if (desc->werr < 0)

		dev_err(&desc->intf->dev, "Error in flush path: %d\n",

			desc->werr);
@@ -974,8 +984,6 @@ static void wdm_disconnect(struct usb_interface *intf) 
	spin_lock_irqsave(&desc->iuspin, flags);

	set_bit(WDM_DISCONNECTING, &desc->flags);

	set_bit(WDM_READ, &desc->flags);

	/* to terminate pending flushes */

	clear_bit(WDM_IN_USE, &desc->flags);

	spin_unlock_irqrestore(&desc->iuspin, flags);

	wake_up_all(&desc->wait);

	mutex_lock(&desc->rlock);

drivers/usb/class/usbtmc.c

+3 −0
Original line number Diff line number Diff line
@@ -2362,8 +2362,11 @@ static int usbtmc_probe(struct usb_interface *intf, 
		goto err_put;

	}



	retcode = -EINVAL;

	data->bulk_in = bulk_in->bEndpointAddress;

	data->wMaxPacketSize = usb_endpoint_maxp(bulk_in);

	if (!data->wMaxPacketSize)

		goto err_put;

	dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n", data->bulk_in);



	data->bulk_out = bulk_out->bEndpointAddress;

drivers/usb/core/hcd-pci.c

+8 −22
Original line number Diff line number Diff line
@@ -216,17 +216,18 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		/* EHCI, OHCI */

		hcd->rsrc_start = pci_resource_start(dev, 0);

		hcd->rsrc_len = pci_resource_len(dev, 0);

		if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,

				driver->description)) {

		if (!devm_request_mem_region(&dev->dev, hcd->rsrc_start,

				hcd->rsrc_len, driver->description)) {

			dev_dbg(&dev->dev, "controller already in use\n");

			retval = -EBUSY;

			goto put_hcd;

		}

		hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);

		hcd->regs = devm_ioremap_nocache(&dev->dev, hcd->rsrc_start,

				hcd->rsrc_len);

		if (hcd->regs == NULL) {

			dev_dbg(&dev->dev, "error mapping memory\n");

			retval = -EFAULT;

			goto release_mem_region;

			goto put_hcd;

		}



	} else {
@@ -240,8 +241,8 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 


			hcd->rsrc_start = pci_resource_start(dev, region);

			hcd->rsrc_len = pci_resource_len(dev, region);

			if (request_region(hcd->rsrc_start, hcd->rsrc_len,

					driver->description))

			if (devm_request_region(&dev->dev, hcd->rsrc_start,

					hcd->rsrc_len, driver->description))

				break;

		}

		if (region == PCI_ROM_RESOURCE) {
@@ -275,20 +276,13 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	}



	if (retval != 0)

		goto unmap_registers;

		goto put_hcd;

	device_wakeup_enable(hcd->self.controller);



	if (pci_dev_run_wake(dev))

		pm_runtime_put_noidle(&dev->dev);

	return retval;



unmap_registers:

	if (driver->flags & HCD_MEMORY) {

		iounmap(hcd->regs);

release_mem_region:

		release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	} else

		release_region(hcd->rsrc_start, hcd->rsrc_len);

put_hcd:

	usb_put_hcd(hcd);

disable_pci:
@@ -347,14 +341,6 @@ void usb_hcd_pci_remove(struct pci_dev *dev) 
		dev_set_drvdata(&dev->dev, NULL);

		up_read(&companions_rwsem);

	}



	if (hcd->driver->flags & HCD_MEMORY) {

		iounmap(hcd->regs);

		release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	} else {

		release_region(hcd->rsrc_start, hcd->rsrc_len);

	}



	usb_put_hcd(hcd);

	pci_disable_device(dev);

}

drivers/usb/gadget/udc/lpc32xx_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -2265,7 +2265,7 @@ static void udc_handle_ep0_setup(struct lpc32xx_udc *udc) 
		default:

			break;

		}



		break;



	case USB_REQ_SET_ADDRESS:

		if (reqtype == (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) {