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

Commit a51a0c8d authored by Clay McClure's avatar Clay McClure Committed by Richard Weinberger
Browse files

ubi: Fix race condition between ubi volume creation and udev 



Similar to commit 714fb87e ("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>
parent c0e860ba

drivers/mtd/ubi/vmt.c

+10 −5
Original line number Diff line number Diff line
@@ -270,6 +270,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;
@@ -298,11 +304,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;
@@ -315,6 +316,10 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	 */

	cdev_device_del(&vol->cdev, &vol->dev);

out_mapping:

	spin_lock(&ubi->volumes_lock);

	ubi->volumes[vol_id] = NULL;

	ubi->vol_count -= 1;

	spin_unlock(&ubi->volumes_lock);

	ubi_eba_destroy_table(eba_tbl);

out_acc:

	spin_lock(&ubi->volumes_lock);