From: Greg Kroah-Hartman Date: Fri, 7 Jan 2022 11:28:43 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.4.299~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=708b2a23dd4643148ead1ee2eb570b2dda0f7a9c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch --- 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 index 00000000000..29f6350e4c2 --- /dev/null +++ b/queue-4.19/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch @@ -0,0 +1,65 @@ +From 754e4382354f7908923a1949d8dc8d05f82f09cb Mon Sep 17 00:00:00 2001 +From: Pavel Skripkin +Date: Tue, 4 Jan 2022 21:28:06 +0300 +Subject: ieee802154: atusb: fix uninit value in atusb_set_extended_addr + +From: Pavel Skripkin + +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 +Acked-by: Alexander Aring +Signed-off-by: Pavel Skripkin +Link: https://lore.kernel.org/r/20220104182806.7188-1-paskripkin@gmail.com +Signed-off-by: Stefan Schmidt +Signed-off-by: Greg Kroah-Hartman +--- + 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); diff --git a/queue-4.19/series b/queue-4.19/series index f2c49ecb132..61d7564fff9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -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