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: Iosif Harutyunov <iharutyunov@sonicwall.com>
[rw: massaged commit message]
Signed-off-by: Richard Weinberger <richard@nod.at>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index ef3618299494..5d524a04d0a3 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -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 @@ out_uif:
         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);