]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Jan 2022 11:28:43 +0000 (12:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Jan 2022 11:28:43 +0000 (12:28 +0100)
added patches:
ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch

queue-4.19/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch b/queue-4.19/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch
new file mode 100644 (file)
index 0000000..29f6350
--- /dev/null
@@ -0,0 +1,65 @@
+From 754e4382354f7908923a1949d8dc8d05f82f09cb Mon Sep 17 00:00:00 2001
+From: Pavel Skripkin <paskripkin@gmail.com>
+Date: Tue, 4 Jan 2022 21:28:06 +0300
+Subject: ieee802154: atusb: fix uninit value in atusb_set_extended_addr
+
+From: Pavel Skripkin <paskripkin@gmail.com>
+
+commit 754e4382354f7908923a1949d8dc8d05f82f09cb upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ieee802154/atusb.c |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/ieee802154/atusb.c
++++ b/drivers/net/ieee802154/atusb.c
+@@ -96,7 +96,9 @@ static int atusb_control_msg(struct atus
+       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",
+@@ -864,9 +866,9 @@ static int atusb_get_and_show_build(stru
+       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);
index f2c49ecb13204e227c6e6d340fe4256c7f491719..61d7564fff9aceec3777f5ee11a9dd822c14eeba 100644 (file)
@@ -1,2 +1,3 @@
 tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch
 tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch
+ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch