| From 96781ab5037676d32663a1fc860819e1f41c7754 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 3 Jan 2017 16:40:03 +0100 |
| Subject: [PATCH] USB: serial: ti_usb_3410_5052: fix NULL-deref at open |
| |
| commit ef079936d3cd09e63612834fe2698eeada0d8e3f upstream. |
| |
| Fix NULL-pointer dereference in open() should a malicious device lack |
| the expected endpoints: |
| |
| Unable to handle kernel NULL pointer dereference at virtual address 00000030 |
| .. |
| [<bf06a6b0>] (ti_open [ti_usb_3410_5052]) from [<bf02e118>] (serial_port_activate+0x68/0x98 [usbserial]) |
| |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c |
| index 07b4bf01061d..c2a6db2189b5 100644 |
| --- a/drivers/usb/serial/ti_usb_3410_5052.c |
| +++ b/drivers/usb/serial/ti_usb_3410_5052.c |
| @@ -584,6 +584,13 @@ static int ti_startup(struct usb_serial *serial) |
| goto free_tdev; |
| } |
| |
| + if (serial->num_bulk_in < serial->num_ports || |
| + serial->num_bulk_out < serial->num_ports) { |
| + dev_err(&serial->interface->dev, "missing endpoints\n"); |
| + status = -ENODEV; |
| + goto free_tdev; |
| + } |
| + |
| return 0; |
| |
| free_tdev: |
| -- |
| 2.10.1 |
| |
