]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: use RCU lock to protect traversal in md_spares_need_change()
authorLi Lingfeng <lilingfeng3@huawei.com>
Thu, 4 Jan 2024 13:36:29 +0000 (21:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:11:08 +0000 (15:11 +0200)
[ Upstream commit 570b9147deb6b07b955b55e06c714ca12a5f3e16 ]

Since md_start_sync() will be called without the protect of mddev_lock,
and it can run concurrently with array reconfiguration, traversal of rdev
in it should be protected by RCU lock.
Commit bc08041b32ab ("md: suspend array in md_start_sync() if array need
reconfiguration") added md_spares_need_change() to md_start_sync(),
casusing use of rdev without any protection.
Fix this by adding RCU lock in md_spares_need_change().

Fixes: bc08041b32ab ("md: suspend array in md_start_sync() if array need reconfiguration")
Cc: stable@vger.kernel.org # 6.7+
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240104133629.1277517-1-lilingfeng@huaweicloud.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/md.c

index 99b60d37114c4900938a23c5348e252ec8619215..40dea4c06457fb064b66c54f0c15186fd7d52ad7 100644 (file)
@@ -9302,9 +9302,14 @@ static bool md_spares_need_change(struct mddev *mddev)
 {
        struct md_rdev *rdev;
 
-       rdev_for_each(rdev, mddev)
-               if (rdev_removeable(rdev) || rdev_addable(rdev))
+       rcu_read_lock();
+       rdev_for_each_rcu(rdev, mddev) {
+               if (rdev_removeable(rdev) || rdev_addable(rdev)) {
+                       rcu_read_unlock();
                        return true;
+               }
+       }
+       rcu_read_unlock();
        return false;
 }