| From 50d72b77809ab6cb3bf50c5ed16966df9ec37834 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Wed, 22 Jan 2020 11:15:26 +0100 |
| Subject: [PATCH] USB: serial: ir-usb: add missing endpoint sanity check |
| |
| commit 2988a8ae7476fe9535ab620320790d1714bdad1d upstream. |
| |
| Add missing endpoint sanity check to avoid dereferencing a NULL-pointer |
| on open() in case a device lacks a bulk-out endpoint. |
| |
| Note that prior to commit f4a4cbb2047e ("USB: ir-usb: reimplement using |
| generic framework") the oops would instead happen on open() if the |
| device lacked a bulk-in endpoint and on write() if it lacked a bulk-out |
| endpoint. |
| |
| Fixes: f4a4cbb2047e ("USB: ir-usb: reimplement using generic framework") |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Cc: stable <stable@vger.kernel.org> |
| Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c |
| index 7643716b5299..ec5406c82f78 100644 |
| --- a/drivers/usb/serial/ir-usb.c |
| +++ b/drivers/usb/serial/ir-usb.c |
| @@ -195,6 +195,9 @@ static int ir_startup(struct usb_serial *serial) |
| struct usb_irda_cs_descriptor *irda_desc; |
| int rates; |
| |
| + if (serial->num_bulk_in < 1 || serial->num_bulk_out < 1) |
| + return -ENODEV; |
| + |
| irda_desc = irda_usb_find_class_desc(serial, 0); |
| if (!irda_desc) { |
| dev_err(&serial->dev->dev, |
| -- |
| 2.7.4 |
| |
