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

Commit e49c8547 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some tiny USB fixes for a number of reported issues for
  5.2-rc3.

  Nothing huge here, just a small collection of xhci and other driver
  bugs that syzbot has been finding in some drivers. There is also a
  usbip fix and a fix for the usbip fix in here :)

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

* tag 'usb-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usbip: usbip_host: fix stub_dev lock context imbalance regression
  media: smsusb: better handle optional alignment
  xhci: Use %zu for printing size_t type
  xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
  xhci: Fix immediate data transfer if buffer is already DMA mapped
  usb: xhci: avoid null pointer deref when bos field is NULL
  usb: xhci: Fix a potential null pointer dereference in xhci_debugfs_create_endpoint()
  xhci: update bounce buffer with correct sg num
  media: usb: siano: Fix false-positive "uninitialized variable" warning
  USB: rio500: update Documentation
  USB: rio500: simplify locking
  USB: rio500: fix memory leak in close after disconnect
  USB: rio500: refuse more than one device at a time
  usbip: usbip_host: fix BUG: sleeping function called from invalid context
  USB: sisusbvga: fix oops in error path of sisusb_probe
  USB: Add LPM quirk for Surface Dock GigE adapter
  media: usb: siano: Fix general protection fault in smsusb
  usb: mtu3: fix up undefined reference to usb_debug_root
  USB: Fix slab-out-of-bounds write in usb_get_bos_descriptor
parents ca191804 3ea3091f

Documentation/usb/rio.txt

+13 −53
Original line number Diff line number Diff line
@@ -76,70 +76,30 @@ Additional Information and userspace tools 
Requirements

============



A host with a USB port.  Ideally, either a UHCI (Intel) or OHCI

(Compaq and others) hardware port should work.

A host with a USB port running a Linux kernel with RIO 500 support enabled.



A Linux development kernel (2.3.x) with USB support enabled or a

backported version to linux-2.2.x.  See http://www.linux-usb.org for

more information on accomplishing this.

The driver is a module called rio500, which should be automatically loaded

as you plug in your device. If that fails you can manually load it with



A Linux kernel with RIO 500 support enabled.



'lspci' which is only needed to determine the type of USB hardware

available in your machine.



Configuration



Using `lspci -v`, determine the type of USB hardware available.



  If you see something like::



    USB Controller: ......

    Flags: .....

    I/O ports at ....



  Then you have a UHCI based controller.



  If you see something like::



     USB Controller: .....

     Flags: ....

     Memory at .....



  Then you have a OHCI based controller.



Using `make menuconfig` or your preferred method for configuring the

kernel, select 'Support for USB', 'OHCI/UHCI' depending on your

hardware (determined from the steps above), 'USB Diamond Rio500 support', and

'Preliminary USB device filesystem'.  Compile and install the modules

(you may need to execute `depmod -a` to update the module

dependencies).

  modprobe rio500



Add a device for the USB rio500::

Udev should automatically create a device node as soon as plug in your device.

If that fails, you can manually add a device for the USB rio500::



  mknod /dev/usb/rio500 c 180 64



Set appropriate permissions for /dev/usb/rio500 (don't forget about

group and world permissions).  Both read and write permissions are

In that case, set appropriate permissions for /dev/usb/rio500 (don't forget

about group and world permissions).  Both read and write permissions are

required for proper operation.



Load the appropriate modules (if compiled as modules):



  OHCI::



    modprobe usbcore

    modprobe usb-ohci

    modprobe rio500



  UHCI::



    modprobe usbcore

    modprobe usb-uhci  (or uhci)

    modprobe rio500



That's it.  The Rio500 Utils at: http://rio500.sourceforge.net should

be able to access the rio500.



Limits

======



You can use only a single rio500 device at a time with your computer.



Bugs

====

drivers/media/usb/siano/smsusb.c

+20 −13
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	struct smsusb_device_t *dev;

	void *mdev;

	int i, rc;

	int align = 0;



	/* create device object */

	dev = kzalloc(sizeof(struct smsusb_device_t), GFP_KERNEL);
@@ -400,6 +401,24 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	dev->udev = interface_to_usbdev(intf);

	dev->state = SMSUSB_DISCONNECTED;



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

		struct usb_endpoint_descriptor *desc =

				&intf->cur_altsetting->endpoint[i].desc;



		if (desc->bEndpointAddress & USB_DIR_IN) {

			dev->in_ep = desc->bEndpointAddress;

			align = usb_endpoint_maxp(desc) - sizeof(struct sms_msg_hdr);

		} else {

			dev->out_ep = desc->bEndpointAddress;

		}

	}



	pr_debug("in_ep = %02x, out_ep = %02x\n", dev->in_ep, dev->out_ep);

	if (!dev->in_ep || !dev->out_ep || align < 0) {  /* Missing endpoints? */

		smsusb_term_device(intf);

		return -ENODEV;

	}



	params.device_type = sms_get_board(board_id)->type;



	switch (params.device_type) {
@@ -414,24 +433,12 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
		/* fall-thru */

	default:

		dev->buffer_size = USB2_BUFFER_SIZE;

		dev->response_alignment =

		    le16_to_cpu(dev->udev->ep_in[1]->desc.wMaxPacketSize) -

		    sizeof(struct sms_msg_hdr);

		dev->response_alignment = align;



		params.flags |= SMS_DEVICE_FAMILY2;

		break;

	}



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

		if (intf->cur_altsetting->endpoint[i].desc. bEndpointAddress & USB_DIR_IN)

			dev->in_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress;

		else

			dev->out_ep = intf->cur_altsetting->endpoint[i].desc.bEndpointAddress;

	}



	pr_debug("in_ep = %02x, out_ep = %02x\n",

		dev->in_ep, dev->out_ep);



	params.device = &dev->udev->dev;

	params.usb_device = dev->udev;

	params.buffer_size = dev->buffer_size;

drivers/usb/core/config.c

+2 −2
Original line number Diff line number Diff line
@@ -932,8 +932,8 @@ int usb_get_bos_descriptor(struct usb_device *dev) 


	/* Get BOS descriptor */

	ret = usb_get_descriptor(dev, USB_DT_BOS, 0, bos, USB_DT_BOS_SIZE);

	if (ret < USB_DT_BOS_SIZE) {

		dev_err(ddev, "unable to get BOS descriptor\n");

	if (ret < USB_DT_BOS_SIZE || bos->bLength < USB_DT_BOS_SIZE) {

		dev_err(ddev, "unable to get BOS descriptor or descriptor too short\n");

		if (ret >= 0)

			ret = -ENOMSG;

		kfree(bos);

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -209,6 +209,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Microsoft LifeCam-VX700 v2.0 */

	{ USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Microsoft Surface Dock Ethernet (RTL8153 GigE) */

	{ USB_DEVICE(0x045e, 0x07c6), .driver_info = USB_QUIRK_NO_LPM },



	/* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */

	{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/host/xhci-debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -440,6 +440,9 @@ void xhci_debugfs_create_endpoint(struct xhci_hcd *xhci, 
	struct xhci_ep_priv	*epriv;

	struct xhci_slot_priv	*spriv = dev->debugfs_private;



	if (!spriv)

		return;



	if (spriv->eps[ep_index])

		return;