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

Commit afbaa90b authored by NeilBrown's avatar NeilBrown
Browse files

md/bitmap: prevent bitmap_daemon_work running while initialising bitmap 



If a bitmap is added while the array is active, it is possible
for bitmap_daemon_work to run while the bitmap is being
initialised.
This is particularly a problem if bitmap_daemon_work sees
bitmap->filemap as non-NULL before it has been filled in properly.
So hold bitmap_info.mutex while filling in ->filemap
to prevent problems.

This patch is suitable for any -stable kernel, though it might not
apply cleanly before about 3.1.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent f4380a91

drivers/md/bitmap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1785,7 +1785,9 @@ int bitmap_load(struct mddev *mddev) 
		 * re-add of a missing device */

		 * re-add of a missing device */

		start = mddev->recovery_cp;

		start = mddev->recovery_cp;





	mutex_lock(&mddev->bitmap_info.mutex);

	err = bitmap_init_from_disk(bitmap, start);

	err = bitmap_init_from_disk(bitmap, start);

	mutex_unlock(&mddev->bitmap_info.mutex);





	if (err)

	if (err)

		goto out;

		goto out;