Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0bdc809 authored by Xiaomeng Tong's avatar Xiaomeng Tong Committed by Greg Kroah-Hartman
Browse files

md: fix an incorrect NULL check in does_sb_need_changing 



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: 2aa82191 ("md-cluster: Perform a lazy update")
Acked-by: default avatarGuoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: default avatarXiaomeng Tong <xiam0nd.tong@gmail.com>
Acked-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3623f833

drivers/md/md.c

+5 −3
Original line number Diff line number Diff line
@@ -2532,14 +2532,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)