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

Commit f5b58c98 authored by Clay McClure's avatar Clay McClure Committed by Greg Kroah-Hartman
Browse files

ubi: Fix race condition between ubi volume creation and udev 



commit a51a0c8d213594bc094cb8e54aad0cb6d7f7b9a6 upstream.

Similar to commit 714fb87e8bc0 ("ubi: Fix race condition between ubi
device creation and udev"), we should make the volume active before
registering it.

Signed-off-by: default avatarClay McClure <clay@daemons.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ccab18a6

drivers/mtd/ubi/vmt.c

+10 −5
Original line number Diff line number Diff line
@@ -308,6 +308,12 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
			vol->last_eb_bytes = vol->usable_leb_size;

	}



	/* Make volume "available" before it becomes accessible via sysfs */

	spin_lock(&ubi->volumes_lock);

	ubi->volumes[vol_id] = vol;

	ubi->vol_count += 1;

	spin_unlock(&ubi->volumes_lock);



	/* Register character device for the volume */

	cdev_init(&vol->cdev, &ubi_vol_cdev_operations);

	vol->cdev.owner = THIS_MODULE;
@@ -350,11 +356,6 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	if (err)

		goto out_sysfs;



	spin_lock(&ubi->volumes_lock);

	ubi->volumes[vol_id] = vol;

	ubi->vol_count += 1;

	spin_unlock(&ubi->volumes_lock);



	ubi_volume_notify(ubi, vol, UBI_VOLUME_ADDED);

	self_check_volumes(ubi);

	return err;
@@ -374,6 +375,10 @@ out_sysfs: 
out_cdev:

	cdev_del(&vol->cdev);

out_mapping:

	spin_lock(&ubi->volumes_lock);

	ubi->volumes[vol_id] = NULL;

	ubi->vol_count -= 1;

	spin_unlock(&ubi->volumes_lock);

	if (do_free)

		kfree(vol->eba_tbl);

out_acc: