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

Commit 040e3abb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here is a USB fix for the reported issue with commit 69bec725
  ("USB: core: let USB device know device node") as well as some other
  issues that have been reported so far with this merge window"

* tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: uas: Reduce can_queue to MAX_CMNDS
  USB: cdc-acm: more sanity checking
  USB: usb_driver_claim_interface: add sanity checking
  usb/core: usb_alloc_dev(): fix setting of ->portnum
  USB: iowarrior: fix oops with malicious USB descriptors
parents f7813ad5 55ff8cfb

drivers/usb/class/cdc-acm.c

+3 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,9 @@ static int acm_probe(struct usb_interface *intf, 
	if (quirks == NO_UNION_NORMAL) {

		data_interface = usb_ifnum_to_if(usb_dev, 1);

		control_interface = usb_ifnum_to_if(usb_dev, 0);

		/* we would crash */

		if (!data_interface || !control_interface)

			return -ENODEV;

		goto skip_normal_probe;

	}

drivers/usb/core/driver.c

+5 −1
Original line number Diff line number Diff line
@@ -502,11 +502,15 @@ static int usb_unbind_interface(struct device *dev) 
int usb_driver_claim_interface(struct usb_driver *driver,

				struct usb_interface *iface, void *priv)

{

	struct device *dev = &iface->dev;

	struct device *dev;

	struct usb_device *udev;

	int retval = 0;

	int lpm_disable_error;



	if (!iface)

		return -ENODEV;



	dev = &iface->dev;

	if (dev->driver)

		return -EBUSY;

drivers/usb/core/usb.c

+3 −2
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, 
	struct usb_device *dev;

	struct usb_hcd *usb_hcd = bus_to_hcd(bus);

	unsigned root_hub = 0;

	unsigned raw_port = port1;



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)
@@ -498,11 +499,11 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, 


		if (!parent->parent) {

			/* device under root hub's port */

			port1 = usb_hcd_find_raw_port_number(usb_hcd,

			raw_port = usb_hcd_find_raw_port_number(usb_hcd,

				port1);

		}

		dev->dev.of_node = usb_of_get_child_node(parent->dev.of_node,

				port1);

				raw_port);



		/* hub driver sets up TT records */

	}

drivers/usb/misc/iowarrior.c

+6 −0
Original line number Diff line number Diff line
@@ -787,6 +787,12 @@ static int iowarrior_probe(struct usb_interface *interface, 
	iface_desc = interface->cur_altsetting;

	dev->product_id = le16_to_cpu(udev->descriptor.idProduct);



	if (iface_desc->desc.bNumEndpoints < 1) {

		dev_err(&interface->dev, "Invalid number of endpoints\n");

		retval = -EINVAL;

		goto error;

	}



	/* set up the endpoint information */

	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {

		endpoint = &iface_desc->endpoint[i].desc;

drivers/usb/storage/uas.c

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static struct scsi_host_template uas_host_template = { 
	.slave_configure = uas_slave_configure,

	.eh_abort_handler = uas_eh_abort_handler,

	.eh_bus_reset_handler = uas_eh_bus_reset_handler,

	.can_queue = 65536,	/* Is there a limit on the _host_ ? */

	.can_queue = MAX_CMNDS,

	.this_id = -1,

	.sg_tablesize = SG_NONE,

	.skip_settle_delay = 1,