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

Commit 50a5528a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 4.20-rc6

  The "largest" here are some xhci fixes for reported issues. Also here
  is a USB core fix, some quirk additions, and a usb-serial fix which
  required the export of one of the tty layer's functions to prevent
  code duplication. The tty maintainer agreed with this change.

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

* tag 'usb-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  xhci: workaround CSS timeout on AMD SNPS 3.0 xHC
  USB: check usb_get_extra_descriptor for proper size
  USB: serial: console: fix reported terminal settings
  usb: quirk: add no-LPM quirk on SanDisk Ultra Flair device
  USB: Fix invalid-free bug in port_over_current_notify()
  usb: appledisplay: Add 27" Apple Cinema Display
parents bc4caf18 3caad34e

drivers/tty/tty_io.c

+9 −2
Original line number Diff line number Diff line
@@ -1373,7 +1373,13 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx) 
	return ERR_PTR(retval);

}



static void tty_free_termios(struct tty_struct *tty)

/**

 * tty_save_termios() - save tty termios data in driver table

 * @tty: tty whose termios data to save

 *

 * Locking: Caller guarantees serialisation with tty_init_termios().

 */

void tty_save_termios(struct tty_struct *tty)

{

	struct ktermios *tp;

	int idx = tty->index;
@@ -1392,6 +1398,7 @@ static void tty_free_termios(struct tty_struct *tty) 
	}

	*tp = tty->termios;

}

EXPORT_SYMBOL_GPL(tty_save_termios);



/**

 *	tty_flush_works		-	flush all works of a tty/pty pair
@@ -1491,7 +1498,7 @@ static void release_tty(struct tty_struct *tty, int idx) 
	WARN_ON(!mutex_is_locked(&tty_mutex));

	if (tty->ops->shutdown)

		tty->ops->shutdown(tty);

	tty_free_termios(tty);

	tty_save_termios(tty);

	tty_driver_remove_tty(tty->driver, tty);

	tty->port->itty = NULL;

	if (tty->link)

drivers/usb/core/hub.c

+3 −2
Original line number Diff line number Diff line
@@ -2251,7 +2251,7 @@ static int usb_enumerate_device_otg(struct usb_device *udev) 
		/* descriptor may appear anywhere in config */

		err = __usb_get_extra_descriptor(udev->rawdescriptors[0],

				le16_to_cpu(udev->config[0].desc.wTotalLength),

				USB_DT_OTG, (void **) &desc);

				USB_DT_OTG, (void **) &desc, sizeof(*desc));

		if (err || !(desc->bmAttributes & USB_OTG_HNP))

			return 0;
@@ -5163,7 +5163,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
/* Handle notifying userspace about hub over-current events */

static void port_over_current_notify(struct usb_port *port_dev)

{

	static char *envp[] = { NULL, NULL, NULL };

	char *envp[3];

	struct device *hub_dev;

	char *port_dev_path;
@@ -5187,6 +5187,7 @@ static void port_over_current_notify(struct usb_port *port_dev) 
	if (!envp[1])

		goto exit;



	envp[2] = NULL;

	kobject_uevent_env(&hub_dev->kobj, KOBJ_CHANGE, envp);



	kfree(envp[1]);

drivers/usb/core/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -333,6 +333,10 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* Midiman M-Audio Keystation 88es */

	{ USB_DEVICE(0x0763, 0x0192), .driver_info = USB_QUIRK_RESET_RESUME },



	/* SanDisk Ultra Fit and Ultra Flair */

	{ USB_DEVICE(0x0781, 0x5583), .driver_info = USB_QUIRK_NO_LPM },

	{ USB_DEVICE(0x0781, 0x5591), .driver_info = USB_QUIRK_NO_LPM },



	/* M-Systems Flash Disk Pioneers */

	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/core/usb.c

+3 −3
Original line number Diff line number Diff line
@@ -832,14 +832,14 @@ EXPORT_SYMBOL_GPL(usb_get_current_frame_number); 
 */



int __usb_get_extra_descriptor(char *buffer, unsigned size,

			       unsigned char type, void **ptr)

			       unsigned char type, void **ptr, size_t minsize)

{

	struct usb_descriptor_header *header;



	while (size >= sizeof(struct usb_descriptor_header)) {

		header = (struct usb_descriptor_header *)buffer;



		if (header->bLength < 2) {

		if (header->bLength < 2 || header->bLength > size) {

			printk(KERN_ERR

				"%s: bogus descriptor, type %d length %d\n",

				usbcore_name,
@@ -848,7 +848,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size, 
			return -1;

		}



		if (header->bDescriptorType == type) {

		if (header->bDescriptorType == type && header->bLength >= minsize) {

			*ptr = header;

			return 0;

		}

drivers/usb/host/hwa-hc.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int hwahc_security_create(struct hwahc *hwahc) 
	top = itr + itr_size;

	result = __usb_get_extra_descriptor(usb_dev->rawdescriptors[index],

			le16_to_cpu(usb_dev->actconfig->desc.wTotalLength),

			USB_DT_SECURITY, (void **) &secd);

			USB_DT_SECURITY, (void **) &secd, sizeof(*secd));

	if (result == -1) {

		dev_warn(dev, "BUG? WUSB host has no security descriptors\n");

		return 0;