Skip to content

Commit 084d7e7

Browse files
committed
Merge tag 'usb-serial-5.7-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for 5.7-rc5 Here's a fix adding a missing input sanity check and a new modem device id. Both have been in linux-next with no reported issues. * tag 'usb-serial-5.7-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: qcserial: Add DW5816e support USB: serial: garmin_gps: add sanity checking for data length
2 parents 7990be4 + 78d6de3 commit 084d7e7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/usb/serial/garmin_gps.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,8 +1138,8 @@ static void garmin_read_process(struct garmin_data *garmin_data_p,
11381138
send it directly to the tty port */
11391139
if (garmin_data_p->flags & FLAGS_QUEUING) {
11401140
pkt_add(garmin_data_p, data, data_length);
1141-
} else if (bulk_data ||
1142-
getLayerId(data) == GARMIN_LAYERID_APPL) {
1141+
} else if (bulk_data || (data_length >= sizeof(u32) &&
1142+
getLayerId(data) == GARMIN_LAYERID_APPL)) {
11431143

11441144
spin_lock_irqsave(&garmin_data_p->lock, flags);
11451145
garmin_data_p->flags |= APP_RESP_SEEN;

drivers/usb/serial/qcserial.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ static const struct usb_device_id id_table[] = {
173173
{DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
174174
{DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */
175175
{DEVICE_SWI(0x413c, 0x81b6)}, /* Dell Wireless 5811e QDL */
176+
{DEVICE_SWI(0x413c, 0x81cc)}, /* Dell Wireless 5816e */
176177
{DEVICE_SWI(0x413c, 0x81cf)}, /* Dell Wireless 5819 */
177178
{DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */
178179
{DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */

0 commit comments

Comments
 (0)