From b302672ac788b97ddbf79604a24e49f8a04a5671 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 28 Jun 2019 15:43:25 -0400 Subject: [PATCH] fixes for 4.19 Signed-off-by: Sasha Levin --- .../qmi_wwan-fix-out-of-bounds-read.patch | 56 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 57 insertions(+) create mode 100644 queue-4.19/qmi_wwan-fix-out-of-bounds-read.patch diff --git a/queue-4.19/qmi_wwan-fix-out-of-bounds-read.patch b/queue-4.19/qmi_wwan-fix-out-of-bounds-read.patch new file mode 100644 index 00000000000..283d7d3a196 --- /dev/null +++ b/queue-4.19/qmi_wwan-fix-out-of-bounds-read.patch @@ -0,0 +1,56 @@ +From f5fa27341e4257110dbcfd250357ca4271bb83d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= +Date: Mon, 24 Jun 2019 18:45:11 +0200 +Subject: qmi_wwan: Fix out-of-bounds read +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 904d88d743b0c94092c5117955eab695df8109e8 ] + +The syzbot reported + + Call Trace: + __dump_stack lib/dump_stack.c:77 [inline] + dump_stack+0xca/0x13e lib/dump_stack.c:113 + print_address_description+0x67/0x231 mm/kasan/report.c:188 + __kasan_report.cold+0x1a/0x32 mm/kasan/report.c:317 + kasan_report+0xe/0x20 mm/kasan/common.c:614 + qmi_wwan_probe+0x342/0x360 drivers/net/usb/qmi_wwan.c:1417 + usb_probe_interface+0x305/0x7a0 drivers/usb/core/driver.c:361 + really_probe+0x281/0x660 drivers/base/dd.c:509 + driver_probe_device+0x104/0x210 drivers/base/dd.c:670 + __device_attach_driver+0x1c2/0x220 drivers/base/dd.c:777 + bus_for_each_drv+0x15c/0x1e0 drivers/base/bus.c:454 + +Caused by too many confusing indirections and casts. +id->driver_info is a pointer stored in a long. We want the +pointer here, not the address of it. + +Thanks-to: Hillf Danton +Reported-by: syzbot+b68605d7fadd21510de1@syzkaller.appspotmail.com +Cc: Kristian Evensen +Fixes: e4bf63482c30 ("qmi_wwan: Add quirk for Quectel dynamic config") +Signed-off-by: Bjørn Mork +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index d9a6699abe59..e657d8947125 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1412,7 +1412,7 @@ static int qmi_wwan_probe(struct usb_interface *intf, + * different. Ignore the current interface if the number of endpoints + * equals the number for the diag interface (two). + */ +- info = (void *)&id->driver_info; ++ info = (void *)id->driver_info; + + if (info->data & QMI_WWAN_QUIRK_QUECTEL_DYNCFG) { + if (desc->bNumEndpoints == 2) +-- +2.20.1 + diff --git a/queue-4.19/series b/queue-4.19/series index eb2a185f60f..96917eb49c9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -19,3 +19,4 @@ ib-hfi1-close-psm-sdma_progress-sleep-window.patch 9p-trans_fd-abort-p9_read_work-if-req-status-changed.patch 9p-trans_fd-put-worker-reqs-on-destroy.patch net-9p-include-trans_common.h-to-fix-missing-prototy.patch +qmi_wwan-fix-out-of-bounds-read.patch -- 2.47.3