Commit 1293147a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some small USB driver fixes and new device ids for
  6.10-final. Included in here are:

   - new usb-serial device ids for reported devices

   - syzbot-triggered duplicate endpoint bugfix

   - gadget bugfix for configfs memory overwrite

   - xhci resume bugfix

   - new device quirk added

   - usb core error path bugfix

  All of these have been in linux-next (most for a while) with no
  reported issues"

* tag 'usb-6.10-final' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: serial: mos7840: fix crash on resume
  USB: serial: option: add Rolling RW350-GL variants
  USB: serial: option: add support for Foxconn T99W651
  USB: serial: option: add Netprisma LCUK54 series modules
  usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
  usb: dwc3: pci: add support for the Intel Panther Lake
  usb: core: add missing of_node_put() in usb_of_has_devices_or_graph
  USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k
  USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor
  xhci: always resume roothubs if xHC was reset during resume
  USB: serial: option: add Telit generic core-dump composition
  USB: serial: option: add Fibocom FM350-GL
  USB: serial: option: add Telit FN912 rmnet compositions
parents 9b48104b 70c8e394

drivers/usb/core/config.c

+15 −3
Original line number Diff line number Diff line
@@ -291,6 +291,20 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, 
	if (ifp->desc.bNumEndpoints >= num_ep)

		goto skip_to_next_endpoint_or_interface_descriptor;



	/* Save a copy of the descriptor and use it instead of the original */

	endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];

	memcpy(&endpoint->desc, d, n);

	d = &endpoint->desc;



	/* Clear the reserved bits in bEndpointAddress */

	i = d->bEndpointAddress &

			(USB_ENDPOINT_DIR_MASK | USB_ENDPOINT_NUMBER_MASK);

	if (i != d->bEndpointAddress) {

		dev_notice(ddev, "config %d interface %d altsetting %d has an endpoint descriptor with address 0x%X, changing to 0x%X\n",

		    cfgno, inum, asnum, d->bEndpointAddress, i);

		endpoint->desc.bEndpointAddress = i;

	}



	/* Check for duplicate endpoint addresses */

	if (config_endpoint_is_duplicate(config, inum, asnum, d)) {

		dev_notice(ddev, "config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n",
@@ -308,10 +322,8 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, 
		}

	}



	endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];

	/* Accept this endpoint */

	++ifp->desc.bNumEndpoints;



	memcpy(&endpoint->desc, d, n);

	INIT_LIST_HEAD(&endpoint->urb_list);



	/*

drivers/usb/core/of.c

+5 −2
Original line number Diff line number Diff line
@@ -84,9 +84,12 @@ static bool usb_of_has_devices_or_graph(const struct usb_device *hub) 
	if (of_graph_is_present(np))

		return true;



	for_each_child_of_node(np, child)

		if (of_property_present(child, "reg"))

	for_each_child_of_node(np, child) {

		if (of_property_present(child, "reg")) {

			of_node_put(child);

			return true;

		}

	}



	return false;

}

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -506,6 +506,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	{ USB_DEVICE(0x1b1c, 0x1b38), .driver_info = USB_QUIRK_DELAY_INIT |

	  USB_QUIRK_DELAY_CTRL_MSG },



	/* START BP-850k Printer */

	{ USB_DEVICE(0x1bc3, 0x0003), .driver_info = USB_QUIRK_NO_SET_INTF },



	/* MIDI keyboard WORLDE MINI */

	{ USB_DEVICE(0x1c75, 0x0204), .driver_info =

			USB_QUIRK_CONFIG_INTF_STRINGS },

drivers/usb/dwc3/dwc3-pci.c

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ 
#define PCI_DEVICE_ID_INTEL_MTL			0x7e7e

#define PCI_DEVICE_ID_INTEL_ARLH_PCH		0x777e

#define PCI_DEVICE_ID_INTEL_TGL			0x9a15

#define PCI_DEVICE_ID_INTEL_PTLH		0xe332

#define PCI_DEVICE_ID_INTEL_PTLH_PCH		0xe37e

#define PCI_DEVICE_ID_INTEL_PTLU		0xe432

#define PCI_DEVICE_ID_INTEL_PTLU_PCH		0xe47e

#define PCI_DEVICE_ID_AMD_MR			0x163a



#define PCI_INTEL_BXT_DSM_GUID		"732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
@@ -430,6 +434,10 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_DEVICE_DATA(INTEL, MTLS, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, ARLH_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, TGL, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLH_PCH, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLU, &dwc3_pci_intel_swnode) },

	{ PCI_DEVICE_DATA(INTEL, PTLU_PCH, &dwc3_pci_intel_swnode) },



	{ PCI_DEVICE_DATA(AMD, NL_USB, &dwc3_pci_amd_swnode) },

	{ PCI_DEVICE_DATA(AMD, MR, &dwc3_pci_amd_mr_swnode) },

drivers/usb/gadget/configfs.c

+3 −0
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ static int usb_string_copy(const char *s, char **s_copy) 
	int ret;

	char *str;

	char *copy = *s_copy;



	ret = strlen(s);

	if (ret > USB_MAX_STRING_LEN)

		return -EOVERFLOW;

	if (ret < 1)

		return -EINVAL;



	if (copy) {

		str = copy;