Commit e2fbe600 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.4-rc2' of... 

Merge tag 'usb-serial-5.4-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for 5.4-rc2

Here's a fix for a long-standing issue in the keyspan driver which could
lead to NULL-pointer dereferences when a device had unexpected endpoint
descriptors.

Included are also some new device IDs.

All but the last two commits have been in linux-next with no reported
issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.4-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: keyspan: fix NULL-derefs on open() and write()
  USB: serial: option: add support for Cinterion CLS8 devices
  USB: serial: option: add Telit FN980 compositions
  USB: serial: ftdi_sio: add device IDs for Sienna and Echelon PL-20
parents 30045f21 7d7e21fa

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,9 @@ static const struct usb_device_id id_table_combined[] = { 
	/* EZPrototypes devices */

	{ USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) },

	{ USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) },

	/* Sienna devices */

	{ USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },

	{ USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) },

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 


#define FTDI_LUMEL_PD12_PID	0x6002



/* Sienna Serial Interface by Secyourit GmbH */

#define FTDI_SIENNA_PID		0x8348



/* Cyber Cortex AV by Fabulous Silicon (http://fabuloussilicon.com) */

#define CYBER_CORTEX_AV_PID	0x8698
@@ -688,6 +691,12 @@ 
#define BANDB_TTL3USB9M_PID	0xAC50

#define BANDB_ZZ_PROG1_USB_PID	0xBA02



/*

 * Echelon USB Serial Interface

 */

#define ECHELON_VID		0x0920

#define ECHELON_U20_PID		0x7500



/*

 * Intrepid Control Systems (http://www.intrepidcs.com/) ValueCAN and NeoVI

 */

drivers/usb/serial/keyspan.c

+2 −2
Original line number Diff line number Diff line
@@ -1741,8 +1741,8 @@ static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint, 


	ep_desc = find_ep(serial, endpoint);

	if (!ep_desc) {

		/* leak the urb, something's wrong and the callers don't care */

		return urb;

		usb_free_urb(urb);

		return NULL;

	}

	if (usb_endpoint_xfer_int(ep_desc)) {

		ep_type_name = "INT";

drivers/usb/serial/option.c

+11 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ static void option_instat_callback(struct urb *urb); 
#define CINTERION_PRODUCT_PH8_AUDIO		0x0083

#define CINTERION_PRODUCT_AHXX_2RMNET		0x0084

#define CINTERION_PRODUCT_AHXX_AUDIO		0x0085

#define CINTERION_PRODUCT_CLS8			0x00b0



/* Olivetti products */

#define OLIVETTI_VENDOR_ID			0x0b3c
@@ -1154,6 +1155,14 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),

	  .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1050, 0xff),	/* Telit FN980 (rmnet) */

	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1051, 0xff),	/* Telit FN980 (MBIM) */

	  .driver_info = NCTRL(0) | RSVD(1) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1052, 0xff),	/* Telit FN980 (RNDIS) */

	  .driver_info = NCTRL(2) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff),	/* Telit FN980 (ECM) */

	  .driver_info = NCTRL(0) | RSVD(1) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),

	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
@@ -1847,6 +1856,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff),

	  .driver_info = RSVD(0) | RSVD(4) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE