From: Greg Kroah-Hartman Date: Thu, 8 Jan 2026 12:31:20 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v6.1.160~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af3a6e5c0cb1948960e6012b1c8e5d17c23efc2;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: mm-damon-tests-vaddr-kunit-handle-alloc-failures-in-damon_test_split_evenly_fail.patch mm-damon-tests-vaddr-kunit-handle-alloc-failures-on-damon_do_test_apply_three_regions.patch rdma-core-fix-kasan-slab-use-after-free-read-in-ib_register_device-problem.patch --- diff --git a/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-in-damon_test_split_evenly_fail.patch b/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-in-damon_test_split_evenly_fail.patch new file mode 100644 index 0000000000..ac36babb86 --- /dev/null +++ b/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-in-damon_test_split_evenly_fail.patch @@ -0,0 +1,49 @@ +From 7890e5b5bb6e386155c6e755fe70e0cdcc77f18e Mon Sep 17 00:00:00 2001 +From: SeongJae Park +Date: Sat, 1 Nov 2025 11:20:12 -0700 +Subject: mm/damon/tests/vaddr-kunit: handle alloc failures in damon_test_split_evenly_fail() + +From: SeongJae Park + +commit 7890e5b5bb6e386155c6e755fe70e0cdcc77f18e upstream. + +damon_test_split_evenly_fail() is assuming all dynamic memory allocation +in it will succeed. Those are indeed likely in the real use cases since +those allocations are too small to fail, but theoretically those could +fail. In the case, inappropriate memory access can happen. Fix it by +appropriately cleanup pre-allocated memory and skip the execution of the +remaining tests in the failure cases. + +Link: https://lkml.kernel.org/r/20251101182021.74868-19-sj@kernel.org +Fixes: 17ccae8bb5c9 ("mm/damon: add kunit tests") +Signed-off-by: SeongJae Park +Cc: Brendan Higgins +Cc: David Gow +Cc: Kefeng Wang +Cc: [5.15+] +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + mm/damon/vaddr-test.h | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/mm/damon/vaddr-test.h ++++ b/mm/damon/vaddr-test.h +@@ -242,7 +242,16 @@ static void damon_test_split_evenly_fail + unsigned long start, unsigned long end, unsigned int nr_pieces) + { + struct damon_target *t = damon_new_target(); +- struct damon_region *r = damon_new_region(start, end); ++ struct damon_region *r; ++ ++ if (!t) ++ kunit_skip(test, "target alloc fail"); ++ ++ r = damon_new_region(start, end); ++ if (!r) { ++ damon_free_target(t); ++ kunit_skip(test, "region alloc fail"); ++ } + + damon_add_region(r, t); + KUNIT_EXPECT_EQ(test, diff --git a/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-on-damon_do_test_apply_three_regions.patch b/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-on-damon_do_test_apply_three_regions.patch new file mode 100644 index 0000000000..8cea29202e --- /dev/null +++ b/queue-6.1/mm-damon-tests-vaddr-kunit-handle-alloc-failures-on-damon_do_test_apply_three_regions.patch @@ -0,0 +1,47 @@ +From 2b22d0fcc6320ba29b2122434c1d2f0785fb0a25 Mon Sep 17 00:00:00 2001 +From: SeongJae Park +Date: Sat, 1 Nov 2025 11:20:11 -0700 +Subject: mm/damon/tests/vaddr-kunit: handle alloc failures on damon_do_test_apply_three_regions() + +From: SeongJae Park + +commit 2b22d0fcc6320ba29b2122434c1d2f0785fb0a25 upstream. + +damon_do_test_apply_three_regions() is assuming all dynamic memory +allocation in it will succeed. Those are indeed likely in the real use +cases since those allocations are too small to fail, but theoretically +those could fail. In the case, inappropriate memory access can happen. +Fix it by appropriately cleanup pre-allocated memory and skip the +execution of the remaining tests in the failure cases. + +Link: https://lkml.kernel.org/r/20251101182021.74868-18-sj@kernel.org +Fixes: 17ccae8bb5c9 ("mm/damon: add kunit tests") +Signed-off-by: SeongJae Park +Cc: Brendan Higgins +Cc: David Gow +Cc: Kefeng Wang +Cc: [5.15+] +Signed-off-by: Andrew Morton +Signed-off-by: SeongJae Park +Signed-off-by: Greg Kroah-Hartman +--- + mm/damon/vaddr-test.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/mm/damon/vaddr-test.h ++++ b/mm/damon/vaddr-test.h +@@ -128,8 +128,14 @@ static void damon_do_test_apply_three_re + int i; + + t = damon_new_target(); ++ if (!t) ++ kunit_skip(test, "target alloc fail"); + for (i = 0; i < nr_regions / 2; i++) { + r = damon_new_region(regions[i * 2], regions[i * 2 + 1]); ++ if (!r) { ++ damon_destroy_target(t); ++ kunit_skip(test, "region alloc fail"); ++ } + damon_add_region(r, t); + } + diff --git a/queue-6.1/rdma-core-fix-kasan-slab-use-after-free-read-in-ib_register_device-problem.patch b/queue-6.1/rdma-core-fix-kasan-slab-use-after-free-read-in-ib_register_device-problem.patch new file mode 100644 index 0000000000..e268a1cfe3 --- /dev/null +++ b/queue-6.1/rdma-core-fix-kasan-slab-use-after-free-read-in-ib_register_device-problem.patch @@ -0,0 +1,85 @@ +From d0706bfd3ee40923c001c6827b786a309e2a8713 Mon Sep 17 00:00:00 2001 +From: Zhu Yanjun +Date: Tue, 6 May 2025 17:10:08 +0200 +Subject: RDMA/core: Fix "KASAN: slab-use-after-free Read in ib_register_device" problem + +From: Zhu Yanjun + +commit d0706bfd3ee40923c001c6827b786a309e2a8713 upstream. + +Call Trace: + + __dump_stack lib/dump_stack.c:94 [inline] + dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 + print_address_description mm/kasan/report.c:408 [inline] + print_report+0xc3/0x670 mm/kasan/report.c:521 + kasan_report+0xe0/0x110 mm/kasan/report.c:634 + strlen+0x93/0xa0 lib/string.c:420 + __fortify_strlen include/linux/fortify-string.h:268 [inline] + get_kobj_path_length lib/kobject.c:118 [inline] + kobject_get_path+0x3f/0x2a0 lib/kobject.c:158 + kobject_uevent_env+0x289/0x1870 lib/kobject_uevent.c:545 + ib_register_device drivers/infiniband/core/device.c:1472 [inline] + ib_register_device+0x8cf/0xe00 drivers/infiniband/core/device.c:1393 + rxe_register_device+0x275/0x320 drivers/infiniband/sw/rxe/rxe_verbs.c:1552 + rxe_net_add+0x8e/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:550 + rxe_newlink+0x70/0x190 drivers/infiniband/sw/rxe/rxe.c:225 + nldev_newlink+0x3a3/0x680 drivers/infiniband/core/nldev.c:1796 + rdma_nl_rcv_msg+0x387/0x6e0 drivers/infiniband/core/netlink.c:195 + rdma_nl_rcv_skb.constprop.0.isra.0+0x2e5/0x450 + netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] + netlink_unicast+0x53a/0x7f0 net/netlink/af_netlink.c:1339 + netlink_sendmsg+0x8d1/0xdd0 net/netlink/af_netlink.c:1883 + sock_sendmsg_nosec net/socket.c:712 [inline] + __sock_sendmsg net/socket.c:727 [inline] + ____sys_sendmsg+0xa95/0xc70 net/socket.c:2566 + ___sys_sendmsg+0x134/0x1d0 net/socket.c:2620 + __sys_sendmsg+0x16d/0x220 net/socket.c:2652 + do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] + do_syscall_64+0xcd/0x260 arch/x86/entry/syscall_64.c:94 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + +This problem is similar to the problem that the +commit 1d6a9e7449e2 ("RDMA/core: Fix use-after-free when rename device name") +fixes. + +The root cause is: the function ib_device_rename() renames the name with +lock. But in the function kobject_uevent(), this name is accessed without +lock protection at the same time. + +The solution is to add the lock protection when this name is accessed in +the function kobject_uevent(). + +Fixes: 779e0bf47632 ("RDMA/core: Do not indicate device ready when device enablement fails") +Link: https://patch.msgid.link/r/20250506151008.75701-1-yanjun.zhu@linux.dev +Reported-by: syzbot+e2ce9e275ecc70a30b72@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=e2ce9e275ecc70a30b72 +Signed-off-by: Zhu Yanjun +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +[ Ajay: Modified to apply on v5.10.y-v6.6.y + ib_device_notify_register() not present in v5.10.y-v6.6.y, + so directly added lock for kobject_uevent() ] +Signed-off-by: Ajay Kaher +Signed-off-by: Shivani Agarwal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/core/device.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/infiniband/core/device.c ++++ b/drivers/infiniband/core/device.c +@@ -1450,8 +1450,13 @@ int ib_register_device(struct ib_device + return ret; + } + dev_set_uevent_suppress(&device->dev, false); ++ ++ down_read(&devices_rwsem); ++ + /* Mark for userspace that device is ready */ + kobject_uevent(&device->dev.kobj, KOBJ_ADD); ++ ++ up_read(&devices_rwsem); + ib_device_put(device); + + return 0; diff --git a/queue-6.1/series b/queue-6.1/series index c3c1c1360f..86bf8c36f6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -512,3 +512,6 @@ drm-nouveau-dispnv50-don-t-call-drm_atomic_get_crtc_state-in-prepare_fb.patch blk-mq-add-helper-for-checking-if-one-cpu-is-mapped-to-specified-hctx.patch tpm-cap-the-number-of-pcr-banks.patch powerpc-64s-radix-kfence-map-__kfence_pool-at-page-granularity.patch +mm-damon-tests-vaddr-kunit-handle-alloc-failures-in-damon_test_split_evenly_fail.patch +mm-damon-tests-vaddr-kunit-handle-alloc-failures-on-damon_do_test_apply_three_regions.patch +rdma-core-fix-kasan-slab-use-after-free-read-in-ib_register_device-problem.patch