]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: fix an incorrect NULL check in does_sb_need_changing
authorXiaomeng Tong <xiam0nd.tong@gmail.com>
Fri, 8 Apr 2022 08:37:28 +0000 (16:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 14:59:28 +0000 (16:59 +0200)
commit fc8738343eefc4ea8afb6122826dea48eacde514 upstream.

The bug is here:
if (!rdev)

The list iterator value 'rdev' will *always* be set and non-NULL
by rdev_for_each(), so it is incorrect to assume that the iterator
value will be NULL if the list is empty or no element found.
Otherwise it will bypass the NULL check and lead to invalid memory
access passing the check.

To fix the bug, use a new variable 'iter' as the list iterator,
while using the original variable 'rdev' as a dedicated pointer to
point to the found element.

Cc: stable@vger.kernel.org
Fixes: 2aa82191ac36 ("md-cluster: Perform a lazy update")
Acked-by: Guoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
Acked-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/md/md.c

index 7e0477e883c7b76a5d70ae7e06a077f3f2f675a5..3dfd03911f399c1aa2c8bc9edc884d07dd408d98 100644 (file)
@@ -2443,14 +2443,16 @@ static void sync_sbs(struct mddev *mddev, int nospares)
 
 static bool does_sb_need_changing(struct mddev *mddev)
 {
-       struct md_rdev *rdev;
+       struct md_rdev *rdev = NULL, *iter;
        struct mdp_superblock_1 *sb;
        int role;
 
        /* Find a good rdev */
-       rdev_for_each(rdev, mddev)
-               if ((rdev->raid_disk >= 0) && !test_bit(Faulty, &rdev->flags))
+       rdev_for_each(iter, mddev)
+               if ((iter->raid_disk >= 0) && !test_bit(Faulty, &iter->flags)) {
+                       rdev = iter;
                        break;
+               }
 
        /* No good device found. */
        if (!rdev)