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

Commit 714fb87e authored by Iosif Harutyunov's avatar Iosif Harutyunov Committed by Richard Weinberger
Browse files

ubi: Fix race condition between ubi device creation and udev 



Install the UBI device object before we arm sysfs.
Otherwise udev tries to read sysfs attributes before UBI is ready and
udev rules will not match.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarIosif Harutyunov <iharutyunov@sonicwall.com>
[rw: massaged commit message]
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 380bc8b7

drivers/mtd/ubi/build.c

+4 −1
Original line number Diff line number Diff line
@@ -992,6 +992,9 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
			goto out_detach;

	}



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

	ubi_devices[ubi_num] = ubi;



	err = uif_init(ubi, &ref);

	if (err)

		goto out_detach;
@@ -1036,7 +1039,6 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	wake_up_process(ubi->bgt_thread);

	spin_unlock(&ubi->wl_lock);



	ubi_devices[ubi_num] = ubi;

	ubi_notify_all(ubi, UBI_VOLUME_ADDED, NULL);

	return ubi_num;
@@ -1047,6 +1049,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	ubi_assert(ref);

	uif_close(ubi);

out_detach:

	ubi_devices[ubi_num] = NULL;

	ubi_wl_close(ubi);

	ubi_free_internal_volumes(ubi);

	vfree(ubi->vtbl);