]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ieee802154: atusb: fix uninit value in atusb_set_extended_addr
authorPavel Skripkin <paskripkin@gmail.com>
Tue, 4 Jan 2022 18:28:06 +0000 (21:28 +0300)
committerStefan Schmidt <stefan@datenfreihafen.org>
Tue, 4 Jan 2022 19:10:04 +0000 (20:10 +0100)
Alexander reported a use of uninitialized value in
atusb_set_extended_addr(), that is caused by reading 0 bytes via
usb_control_msg().

Fix it by validating if the number of bytes transferred is actually
correct, since usb_control_msg() may read less bytes, than was requested
by caller.

Fail log:

BUG: KASAN: uninit-cmp in ieee802154_is_valid_extended_unicast_addr include/linux/ieee802154.h:310 [inline]
BUG: KASAN: uninit-cmp in atusb_set_extended_addr drivers/net/ieee802154/atusb.c:1000 [inline]
BUG: KASAN: uninit-cmp in atusb_probe.cold+0x29f/0x14db drivers/net/ieee802154/atusb.c:1056
Uninit value used in comparison: 311daa649a2003bd stack handle: 000000009a2003bd
 ieee802154_is_valid_extended_unicast_addr include/linux/ieee802154.h:310 [inline]
 atusb_set_extended_addr drivers/net/ieee802154/atusb.c:1000 [inline]
 atusb_probe.cold+0x29f/0x14db drivers/net/ieee802154/atusb.c:1056
 usb_probe_interface+0x314/0x7f0 drivers/usb/core/driver.c:396

Fixes: 7490b008d123 ("ieee802154: add support for atusb transceiver")
Reported-by: Alexander Potapenko <glider@google.com>
Acked-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/20220104182806.7188-1-paskripkin@gmail.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
drivers/net/ieee802154/atusb.c

index 23ee0b14cbfa1f39f5d3a828d2cad130b456bffd..2f5e7b31032aa130f808491b85930b7be07577b9 100644 (file)
@@ -93,7 +93,9 @@ static int atusb_control_msg(struct atusb *atusb, unsigned int pipe,
 
        ret = usb_control_msg(usb_dev, pipe, request, requesttype,
                              value, index, data, size, timeout);
-       if (ret < 0) {
+       if (ret < size) {
+               ret = ret < 0 ? ret : -ENODATA;
+
                atusb->err = ret;
                dev_err(&usb_dev->dev,
                        "%s: req 0x%02x val 0x%x idx 0x%x, error %d\n",
@@ -861,9 +863,9 @@ static int atusb_get_and_show_build(struct atusb *atusb)
        if (!build)
                return -ENOMEM;
 
-       ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),
-                               ATUSB_BUILD, ATUSB_REQ_FROM_DEV, 0, 0,
-                               build, ATUSB_BUILD_SIZE, 1000);
+       /* We cannot call atusb_control_msg() here, since this request may read various length data */
+       ret = usb_control_msg(atusb->usb_dev, usb_rcvctrlpipe(usb_dev, 0), ATUSB_BUILD,
+                             ATUSB_REQ_FROM_DEV, 0, 0, build, ATUSB_BUILD_SIZE, 1000);
        if (ret >= 0) {
                build[ret] = 0;
                dev_info(&usb_dev->dev, "Firmware: build %s\n", build);