]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid...
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 10 Dec 2021 09:03:09 +0000 (10:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 07:46:12 +0000 (08:46 +0100)
commit 4a8737ff068724f509d583fef404d349adba80d6 upstream.

The received data contains the channel the received data is associated
with. If the channel number is bigger than the actual number of
channels assume broken or malicious USB device and shut it down.

This fixes the error found by clang:

| drivers/net/can/usb/gs_usb.c:386:6: error: variable 'dev' is used
|                                     uninitialized whenever 'if' condition is true
|         if (hf->channel >= GS_MAX_INTF)
|             ^~~~~~~~~~~~~~~~~~~~~~~~~~
| drivers/net/can/usb/gs_usb.c:474:10: note: uninitialized use occurs here
|                           hf, dev->gs_hf_size, gs_usb_receive_bulk_callback,
|                               ^~~

Link: https://lore.kernel.org/all/20211210091158.408326-1-mkl@pengutronix.de
Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices")
Cc: stable@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/can/usb/gs_usb.c

index 3e965b00bc09f20eb66915ea9a8e8cdf63903096..e3b6bcb9b50c9cbab20f18d1c4c4a5e028aff8b7 100644 (file)
@@ -303,7 +303,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
 
        /* device reports out of range channel id */
        if (hf->channel >= GS_MAX_INTF)
-               goto resubmit_urb;
+               goto device_detach;
 
        dev = usbcan->canch[hf->channel];
 
@@ -388,6 +388,7 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
 
        /* USB failure take down all interfaces */
        if (rc == -ENODEV) {
+ device_detach:
                for (rc = 0; rc < GS_MAX_INTF; rc++) {
                        if (usbcan->canch[rc])
                                netif_device_detach(usbcan->canch[rc]->netdev);