From 6dd38ebe1a292721d94c8653d3e5476cfa3c203d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 15 Nov 2024 06:24:01 +0100 Subject: [PATCH] 5.10-stable patches added patches: io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch --- ...lock-in-io_register_iowq_max_workers.patch | 55 +++++++++++ ...code-of-mrdev-in-raid10_sync_request.patch | 97 +++++++++++++++++++ ...fix-mte-false-alarm-in-__do_krealloc.patch | 75 ++++++++++++++ queue-5.10/series | 3 + 4 files changed, 230 insertions(+) create mode 100644 queue-5.10/io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch create mode 100644 queue-5.10/md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch create mode 100644 queue-5.10/mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch diff --git a/queue-5.10/io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch b/queue-5.10/io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch new file mode 100644 index 00000000000..1b5d9786a8b --- /dev/null +++ b/queue-5.10/io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch @@ -0,0 +1,55 @@ +From 73254a297c2dd094abec7c9efee32455ae875bdf Mon Sep 17 00:00:00 2001 +From: Hagar Hemdan +Date: Tue, 4 Jun 2024 13:05:27 +0000 +Subject: io_uring: fix possible deadlock in io_register_iowq_max_workers() + +From: Hagar Hemdan + +commit 73254a297c2dd094abec7c9efee32455ae875bdf upstream. + +The io_register_iowq_max_workers() function calls io_put_sq_data(), +which acquires the sqd->lock without releasing the uring_lock. +Similar to the commit 009ad9f0c6ee ("io_uring: drop ctx->uring_lock +before acquiring sqd->lock"), this can lead to a potential deadlock +situation. + +To resolve this issue, the uring_lock is released before calling +io_put_sq_data(), and then it is re-acquired after the function call. + +This change ensures that the locks are acquired in the correct +order, preventing the possibility of a deadlock. + +Suggested-by: Maximilian Heyne +Signed-off-by: Hagar Hemdan +Link: https://lore.kernel.org/r/20240604130527.3597-1-hagarhem@amazon.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/io_uring.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -10653,8 +10653,10 @@ static int io_register_iowq_max_workers( + } + + if (sqd) { ++ mutex_unlock(&ctx->uring_lock); + mutex_unlock(&sqd->lock); + io_put_sq_data(sqd); ++ mutex_lock(&ctx->uring_lock); + } + + if (copy_to_user(arg, new_count, sizeof(new_count))) +@@ -10679,8 +10681,11 @@ static int io_register_iowq_max_workers( + return 0; + err: + if (sqd) { ++ mutex_unlock(&ctx->uring_lock); + mutex_unlock(&sqd->lock); + io_put_sq_data(sqd); ++ mutex_lock(&ctx->uring_lock); ++ + } + return ret; + } diff --git a/queue-5.10/md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch b/queue-5.10/md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch new file mode 100644 index 00000000000..673fadf5c9c --- /dev/null +++ b/queue-5.10/md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch @@ -0,0 +1,97 @@ +From 59f8f0b54c8ffb4521f6bbd1cb6f4dfa5022e75e Mon Sep 17 00:00:00 2001 +From: Li Nan +Date: Sat, 27 May 2023 15:22:16 +0800 +Subject: md/raid10: improve code of mrdev in raid10_sync_request + +From: Li Nan + +commit 59f8f0b54c8ffb4521f6bbd1cb6f4dfa5022e75e upstream. + +'need_recover' and 'mrdev' are equivalent in raid10_sync_request(), and +inc mrdev->nr_pending is unreasonable if don't need recovery. Replace +'need_recover' with 'mrdev', and only inc nr_pending when needed. + +Signed-off-by: Li Nan +Reviewed-by: Yu Kuai +Signed-off-by: Song Liu +Link: https://lore.kernel.org/r/20230527072218.2365857-3-linan666@huaweicloud.com +Cc: Hagar Gamal Halim +Signed-off-by: Greg Kroah-Hartman +--- + drivers/md/raid10.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -3052,7 +3052,6 @@ static sector_t raid10_sync_request(stru + sector_t sect; + int must_sync; + int any_working; +- int need_recover = 0; + struct raid10_info *mirror = &conf->mirrors[i]; + struct md_rdev *mrdev, *mreplace; + +@@ -3060,14 +3059,13 @@ static sector_t raid10_sync_request(stru + mrdev = rcu_dereference(mirror->rdev); + mreplace = rcu_dereference(mirror->replacement); + +- if (mrdev != NULL && +- !test_bit(Faulty, &mrdev->flags) && +- !test_bit(In_sync, &mrdev->flags)) +- need_recover = 1; ++ if (mrdev && (test_bit(Faulty, &mrdev->flags) || ++ test_bit(In_sync, &mrdev->flags))) ++ mrdev = NULL; + if (mreplace && test_bit(Faulty, &mreplace->flags)) + mreplace = NULL; + +- if (!need_recover && !mreplace) { ++ if (!mrdev && !mreplace) { + rcu_read_unlock(); + continue; + } +@@ -3101,7 +3099,8 @@ static sector_t raid10_sync_request(stru + rcu_read_unlock(); + continue; + } +- atomic_inc(&mrdev->nr_pending); ++ if (mrdev) ++ atomic_inc(&mrdev->nr_pending); + if (mreplace) + atomic_inc(&mreplace->nr_pending); + rcu_read_unlock(); +@@ -3188,7 +3187,7 @@ static sector_t raid10_sync_request(stru + r10_bio->devs[1].devnum = i; + r10_bio->devs[1].addr = to_addr; + +- if (need_recover) { ++ if (mrdev) { + bio = r10_bio->devs[1].bio; + bio->bi_next = biolist; + biolist = bio; +@@ -3233,7 +3232,7 @@ static sector_t raid10_sync_request(stru + for (k = 0; k < conf->copies; k++) + if (r10_bio->devs[k].devnum == i) + break; +- if (!test_bit(In_sync, ++ if (mrdev && !test_bit(In_sync, + &mrdev->flags) + && !rdev_set_badblocks( + mrdev, +@@ -3259,12 +3258,14 @@ static sector_t raid10_sync_request(stru + if (rb2) + atomic_dec(&rb2->remaining); + r10_bio = rb2; +- rdev_dec_pending(mrdev, mddev); ++ if (mrdev) ++ rdev_dec_pending(mrdev, mddev); + if (mreplace) + rdev_dec_pending(mreplace, mddev); + break; + } +- rdev_dec_pending(mrdev, mddev); ++ if (mrdev) ++ rdev_dec_pending(mrdev, mddev); + if (mreplace) + rdev_dec_pending(mreplace, mddev); + if (r10_bio->devs[0].bio->bi_opf & MD_FAILFAST) { diff --git a/queue-5.10/mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch b/queue-5.10/mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch new file mode 100644 index 00000000000..62427c7bd9e --- /dev/null +++ b/queue-5.10/mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch @@ -0,0 +1,75 @@ +From 704573851b51808b45dae2d62059d1d8189138a2 Mon Sep 17 00:00:00 2001 +From: Qun-Wei Lin +Date: Fri, 25 Oct 2024 16:58:11 +0800 +Subject: mm: krealloc: Fix MTE false alarm in __do_krealloc + +From: Qun-Wei Lin + +commit 704573851b51808b45dae2d62059d1d8189138a2 upstream. + +This patch addresses an issue introduced by commit 1a83a716ec233 ("mm: +krealloc: consider spare memory for __GFP_ZERO") which causes MTE +(Memory Tagging Extension) to falsely report a slab-out-of-bounds error. + +The problem occurs when zeroing out spare memory in __do_krealloc. The +original code only considered software-based KASAN and did not account +for MTE. It does not reset the KASAN tag before calling memset, leading +to a mismatch between the pointer tag and the memory tag, resulting +in a false positive. + +Example of the error: +================================================================== +swapper/0: BUG: KASAN: slab-out-of-bounds in __memset+0x84/0x188 +swapper/0: Write at addr f4ffff8005f0fdf0 by task swapper/0/1 +swapper/0: Pointer tag: [f4], memory tag: [fe] +swapper/0: +swapper/0: CPU: 4 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.12. +swapper/0: Hardware name: MT6991(ENG) (DT) +swapper/0: Call trace: +swapper/0: dump_backtrace+0xfc/0x17c +swapper/0: show_stack+0x18/0x28 +swapper/0: dump_stack_lvl+0x40/0xa0 +swapper/0: print_report+0x1b8/0x71c +swapper/0: kasan_report+0xec/0x14c +swapper/0: __do_kernel_fault+0x60/0x29c +swapper/0: do_bad_area+0x30/0xdc +swapper/0: do_tag_check_fault+0x20/0x34 +swapper/0: do_mem_abort+0x58/0x104 +swapper/0: el1_abort+0x3c/0x5c +swapper/0: el1h_64_sync_handler+0x80/0xcc +swapper/0: el1h_64_sync+0x68/0x6c +swapper/0: __memset+0x84/0x188 +swapper/0: btf_populate_kfunc_set+0x280/0x3d8 +swapper/0: __register_btf_kfunc_id_set+0x43c/0x468 +swapper/0: register_btf_kfunc_id_set+0x48/0x60 +swapper/0: register_nf_nat_bpf+0x1c/0x40 +swapper/0: nf_nat_init+0xc0/0x128 +swapper/0: do_one_initcall+0x184/0x464 +swapper/0: do_initcall_level+0xdc/0x1b0 +swapper/0: do_initcalls+0x70/0xc0 +swapper/0: do_basic_setup+0x1c/0x28 +swapper/0: kernel_init_freeable+0x144/0x1b8 +swapper/0: kernel_init+0x20/0x1a8 +swapper/0: ret_from_fork+0x10/0x20 +================================================================== + +Fixes: 1a83a716ec233 ("mm: krealloc: consider spare memory for __GFP_ZERO") +Signed-off-by: Qun-Wei Lin +Acked-by: David Rientjes +Signed-off-by: Vlastimil Babka +Signed-off-by: Greg Kroah-Hartman +--- + mm/slab_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/slab_common.c ++++ b/mm/slab_common.c +@@ -1075,7 +1075,7 @@ static __always_inline void *__do_kreall + /* Zero out spare memory. */ + if (want_init_on_alloc(flags)) { + kasan_disable_current(); +- memset((void *)p + new_size, 0, ks - new_size); ++ memset(kasan_reset_tag(p) + new_size, 0, ks - new_size); + kasan_enable_current(); + } + diff --git a/queue-5.10/series b/queue-5.10/series index 7f3a9f9ed33..c940dafca28 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -76,3 +76,6 @@ powerpc-powernv-free-name-on-error-in-opal_event_ini.patch vdpa-ifcvf-fix-pci_read_config_byte-return-code-hand.patch fs-fix-uninitialized-value-issue-in-from_kuid-and-fr.patch net-usb-qmi_wwan-add-fibocom-fg132-0x0112-compositio.patch +md-raid10-improve-code-of-mrdev-in-raid10_sync_request.patch +io_uring-fix-possible-deadlock-in-io_register_iowq_max_workers.patch +mm-krealloc-fix-mte-false-alarm-in-__do_krealloc.patch -- 2.47.2