From: Greg Kroah-Hartman Date: Fri, 7 Jan 2022 11:22:26 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.4.299~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8bd6e230e54e7dc2bb46446b0df3567af9f0dd3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch revert-rdma-mlx5-fix-releasing-unallocated-memory-in-dereg-mr-flow.patch tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch --- diff --git a/queue-5.15/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch b/queue-5.15/ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch new file mode 100644 index 00000000000..f1ab1204a1a --- /dev/null +++ b/queue-5.15/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 +@@ -93,7 +93,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", +@@ -861,9 +863,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-5.15/revert-rdma-mlx5-fix-releasing-unallocated-memory-in-dereg-mr-flow.patch b/queue-5.15/revert-rdma-mlx5-fix-releasing-unallocated-memory-in-dereg-mr-flow.patch new file mode 100644 index 00000000000..8fac4daf534 --- /dev/null +++ b/queue-5.15/revert-rdma-mlx5-fix-releasing-unallocated-memory-in-dereg-mr-flow.patch @@ -0,0 +1,114 @@ +From 4163cb3d1980383220ad7043002b930995dcba33 Mon Sep 17 00:00:00 2001 +From: Maor Gottlieb +Date: Wed, 22 Dec 2021 12:13:12 +0200 +Subject: Revert "RDMA/mlx5: Fix releasing unallocated memory in dereg MR flow" + +From: Maor Gottlieb + +commit 4163cb3d1980383220ad7043002b930995dcba33 upstream. + +This patch is not the full fix and still causes to call traces +during mlx5_ib_dereg_mr(). + +This reverts commit f0ae4afe3d35e67db042c58a52909e06262b740f. + +Fixes: f0ae4afe3d35 ("RDMA/mlx5: Fix releasing unallocated memory in dereg MR flow") +Link: https://lore.kernel.org/r/20211222101312.1358616-1-maorg@nvidia.com +Signed-off-by: Maor Gottlieb +Acked-by: Leon Romanovsky +Signed-off-by: Jason Gunthorpe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +++--- + drivers/infiniband/hw/mlx5/mr.c | 28 +++++++++++++++------------- + 2 files changed, 18 insertions(+), 16 deletions(-) + +--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h ++++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h +@@ -641,6 +641,7 @@ struct mlx5_ib_mr { + + /* User MR data */ + struct mlx5_cache_ent *cache_ent; ++ struct ib_umem *umem; + + /* This is zero'd when the MR is allocated */ + union { +@@ -652,7 +653,7 @@ struct mlx5_ib_mr { + struct list_head list; + }; + +- /* Used only by kernel MRs */ ++ /* Used only by kernel MRs (umem == NULL) */ + struct { + void *descs; + void *descs_alloc; +@@ -674,9 +675,8 @@ struct mlx5_ib_mr { + int data_length; + }; + +- /* Used only by User MRs */ ++ /* Used only by User MRs (umem != NULL) */ + struct { +- struct ib_umem *umem; + unsigned int page_shift; + /* Current access_flags */ + int access_flags; +--- a/drivers/infiniband/hw/mlx5/mr.c ++++ b/drivers/infiniband/hw/mlx5/mr.c +@@ -1911,18 +1911,19 @@ err: + return ret; + } + +-static void mlx5_free_priv_descs(struct mlx5_ib_mr *mr) ++static void ++mlx5_free_priv_descs(struct mlx5_ib_mr *mr) + { +- struct mlx5_ib_dev *dev = to_mdev(mr->ibmr.device); +- int size = mr->max_descs * mr->desc_size; +- +- if (!mr->descs) +- return; +- +- dma_unmap_single(&dev->mdev->pdev->dev, mr->desc_map, size, +- DMA_TO_DEVICE); +- kfree(mr->descs_alloc); +- mr->descs = NULL; ++ if (!mr->umem && mr->descs) { ++ struct ib_device *device = mr->ibmr.device; ++ int size = mr->max_descs * mr->desc_size; ++ struct mlx5_ib_dev *dev = to_mdev(device); ++ ++ dma_unmap_single(&dev->mdev->pdev->dev, mr->desc_map, size, ++ DMA_TO_DEVICE); ++ kfree(mr->descs_alloc); ++ mr->descs = NULL; ++ } + } + + int mlx5_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) +@@ -1998,8 +1999,7 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr, + if (mr->cache_ent) { + mlx5_mr_cache_free(dev, mr); + } else { +- if (!udata) +- mlx5_free_priv_descs(mr); ++ mlx5_free_priv_descs(mr); + kfree(mr); + } + return 0; +@@ -2086,6 +2086,7 @@ static struct mlx5_ib_mr *mlx5_ib_alloc_ + if (err) + goto err_free_in; + ++ mr->umem = NULL; + kfree(in); + + return mr; +@@ -2212,6 +2213,7 @@ static struct ib_mr *__mlx5_ib_alloc_mr( + } + + mr->ibmr.device = pd->device; ++ mr->umem = NULL; + + switch (mr_type) { + case IB_MR_TYPE_MEM_REG: diff --git a/queue-5.15/series b/queue-5.15/series index 13648679246..2b84a064da9 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,2 +1,6 @@ fscache_cookie_enabled-check-cookie-is-valid-before-accessing-it.patch selftests-x86-fix-warn-in-test_process_vm_readv.patch +tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch +tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch +revert-rdma-mlx5-fix-releasing-unallocated-memory-in-dereg-mr-flow.patch +ieee802154-atusb-fix-uninit-value-in-atusb_set_extended_addr.patch diff --git a/queue-5.15/tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch b/queue-5.15/tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch new file mode 100644 index 00000000000..9524a1247b5 --- /dev/null +++ b/queue-5.15/tracing-fix-check-for-trace_percpu_buffer-validity-in-get_trace_buf.patch @@ -0,0 +1,59 @@ +From 823e670f7ed616d0ce993075c8afe0217885f79d Mon Sep 17 00:00:00 2001 +From: "Naveen N. Rao" +Date: Thu, 23 Dec 2021 16:04:38 +0530 +Subject: tracing: Fix check for trace_percpu_buffer validity in get_trace_buf() + +From: Naveen N. Rao + +commit 823e670f7ed616d0ce993075c8afe0217885f79d upstream. + +With the new osnoise tracer, we are seeing the below splat: + Kernel attempted to read user page (c7d880000) - exploit attempt? (uid: 0) + BUG: Unable to handle kernel data access on read at 0xc7d880000 + Faulting instruction address: 0xc0000000002ffa10 + Oops: Kernel access of bad area, sig: 11 [#1] + LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries + ... + NIP [c0000000002ffa10] __trace_array_vprintk.part.0+0x70/0x2f0 + LR [c0000000002ff9fc] __trace_array_vprintk.part.0+0x5c/0x2f0 + Call Trace: + [c0000008bdd73b80] [c0000000001c49cc] put_prev_task_fair+0x3c/0x60 (unreliable) + [c0000008bdd73be0] [c000000000301430] trace_array_printk_buf+0x70/0x90 + [c0000008bdd73c00] [c0000000003178b0] trace_sched_switch_callback+0x250/0x290 + [c0000008bdd73c90] [c000000000e70d60] __schedule+0x410/0x710 + [c0000008bdd73d40] [c000000000e710c0] schedule+0x60/0x130 + [c0000008bdd73d70] [c000000000030614] interrupt_exit_user_prepare_main+0x264/0x270 + [c0000008bdd73de0] [c000000000030a70] syscall_exit_prepare+0x150/0x180 + [c0000008bdd73e10] [c00000000000c174] system_call_vectored_common+0xf4/0x278 + +osnoise tracer on ppc64le is triggering osnoise_taint() for negative +duration in get_int_safe_duration() called from +trace_sched_switch_callback()->thread_exit(). + +The problem though is that the check for a valid trace_percpu_buffer is +incorrect in get_trace_buf(). The check is being done after calculating +the pointer for the current cpu, rather than on the main percpu pointer. +Fix the check to be against trace_percpu_buffer. + +Link: https://lkml.kernel.org/r/a920e4272e0b0635cf20c444707cbce1b2c8973d.1640255304.git.naveen.n.rao@linux.vnet.ibm.com + +Cc: stable@vger.kernel.org +Fixes: e2ace001176dc9 ("tracing: Choose static tp_printk buffer by explicit nesting count") +Signed-off-by: Naveen N. Rao +Signed-off-by: Steven Rostedt +Signed-off-by: Greg Kroah-Hartman +--- + kernel/trace/trace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -3241,7 +3241,7 @@ static char *get_trace_buf(void) + { + struct trace_buffer_struct *buffer = this_cpu_ptr(trace_percpu_buffer); + +- if (!buffer || buffer->nesting >= 4) ++ if (!trace_percpu_buffer || buffer->nesting >= 4) + return NULL; + + buffer->nesting++; diff --git a/queue-5.15/tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch b/queue-5.15/tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch new file mode 100644 index 00000000000..8fb5856c17d --- /dev/null +++ b/queue-5.15/tracing-tag-trace_percpu_buffer-as-a-percpu-pointer.patch @@ -0,0 +1,50 @@ +From f28439db470cca8b6b082239314e9fd10bd39034 Mon Sep 17 00:00:00 2001 +From: "Naveen N. Rao" +Date: Thu, 23 Dec 2021 16:04:39 +0530 +Subject: tracing: Tag trace_percpu_buffer as a percpu pointer + +From: Naveen N. Rao + +commit f28439db470cca8b6b082239314e9fd10bd39034 upstream. + +Tag trace_percpu_buffer as a percpu pointer to resolve warnings +reported by sparse: + /linux/kernel/trace/trace.c:3218:46: warning: incorrect type in initializer (different address spaces) + /linux/kernel/trace/trace.c:3218:46: expected void const [noderef] __percpu *__vpp_verify + /linux/kernel/trace/trace.c:3218:46: got struct trace_buffer_struct * + /linux/kernel/trace/trace.c:3234:9: warning: incorrect type in initializer (different address spaces) + /linux/kernel/trace/trace.c:3234:9: expected void const [noderef] __percpu *__vpp_verify + /linux/kernel/trace/trace.c:3234:9: got int * + +Link: https://lkml.kernel.org/r/ebabd3f23101d89cb75671b68b6f819f5edc830b.1640255304.git.naveen.n.rao@linux.vnet.ibm.com + +Cc: stable@vger.kernel.org +Reported-by: kernel test robot +Fixes: 07d777fe8c398 ("tracing: Add percpu buffers for trace_printk()") +Signed-off-by: Naveen N. Rao +Signed-off-by: Steven Rostedt +Signed-off-by: Greg Kroah-Hartman +--- + kernel/trace/trace.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -3231,7 +3231,7 @@ struct trace_buffer_struct { + char buffer[4][TRACE_BUF_SIZE]; + }; + +-static struct trace_buffer_struct *trace_percpu_buffer; ++static struct trace_buffer_struct __percpu *trace_percpu_buffer; + + /* + * This allows for lockless recording. If we're nested too deeply, then +@@ -3260,7 +3260,7 @@ static void put_trace_buf(void) + + static int alloc_percpu_trace_buffer(void) + { +- struct trace_buffer_struct *buffers; ++ struct trace_buffer_struct __percpu *buffers; + + if (trace_percpu_buffer) + return 0;