| Message ID | 20200122101530.29176-2-johan@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2988a8ae7476fe9535ab620320790d1714bdad1d |
| Headers | show |
| Series | USB: serial: ir-usb fixes and cleanups | expand |
On Wed, Jan 22, 2020 at 11:15:26AM +0100, Johan Hovold wrote: > 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> > Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 302eb9530859..c3b06fc5a7f0 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,
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> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/usb/serial/ir-usb.c | 3 +++ 1 file changed, 3 insertions(+)