]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: don't rely on 'mddev->pers' to be set in mddev_suspend()
authorYu Kuai <yukuai3@huawei.com>
Fri, 25 Aug 2023 03:09:52 +0000 (11:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 17:14:44 +0000 (17:14 +0000)
[ Upstream commit b721e7885eb242aa2459ee66bb42ceef1bcf0f0c ]

'active_io' used to be initialized while the array is running, and
'mddev->pers' is set while the array is running as well. Hence caller
must hold 'reconfig_mutex' and guarantee 'mddev->pers' is set before
calling mddev_suspend().

Now that 'active_io' is initialized when mddev is allocated, such
restriction doesn't exist anymore. In the meantime, follow up patches
will refactor mddev_suspend(), hence add checking for 'mddev->pers' to
prevent null-ptr-deref.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230825030956.1527023-4-yukuai1@huaweicloud.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/md.c

index 78d51dddf3a004d692cd1861055094043ec30359..34b7196d9634c2c3b7003375da8be3bc91b02c45 100644 (file)
@@ -449,7 +449,7 @@ void mddev_suspend(struct mddev *mddev)
        set_bit(MD_ALLOW_SB_UPDATE, &mddev->flags);
        percpu_ref_kill(&mddev->active_io);
 
-       if (mddev->pers->prepare_suspend)
+       if (mddev->pers && mddev->pers->prepare_suspend)
                mddev->pers->prepare_suspend(mddev);
 
        wait_event(mddev->sb_wait, percpu_ref_is_zero(&mddev->active_io));