If a flash driver is unbound while userspace adds a partition, removal can find the new partition before it is registered or release it before its sysfs attributes are added. If removal finishes first, the ioctl can even register a new partition on a master that has been unregistered. Hold partitions_lock from the start of partition allocation until the device and its attributes are registered. Mark the master as being unregistered under the same lock so a later ioctl fails before allocation can read bad-block markers. Clear the flag when registering the master. Fixes: 5daa7b21496a ("mtd: prepare partition add and del functions for ioctl requests") Cc: stable@vger.kernel.org Signed-off-by: James Hilliard --- Changes in v2: - Use mutex guards to keep publication and teardown lock scopes explicit. - Link to v1: https://patch.msgid.link/20261108-submit-mtd-partition-publication-v1-v1-1-cbff20b1351e@gmail.com --- drivers/mtd/mtdcore.c | 4 ++++ drivers/mtd/mtdpart.c | 9 ++++----- include/linux/mtd/mtd.h | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index b170c3144ca8..5ee1eb29fc1a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -918,6 +918,7 @@ static void mtd_set_dev_defaults(struct mtd_info *mtd) INIT_LIST_HEAD(&mtd->partitions); mutex_init(&mtd->master.partitions_lock); mutex_init(&mtd->master.chrdev_lock); + mtd->master.unregistering = false; } static ssize_t mtd_otp_size(struct mtd_info *mtd, bool is_user) @@ -1206,6 +1207,9 @@ int mtd_device_unregister(struct mtd_info *master) { int err; + scoped_guard(mutex, &master->master.partitions_lock) + master->master.unregistering = true; + if (master->_reboot) { unregister_reboot_notifier(&master->reboot_notifier); memset(&master->reboot_notifier, 0, sizeof(master->reboot_notifier)); diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index ddded0dbe77e..b20fa4309084 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -278,13 +278,15 @@ int mtd_add_partition(struct mtd_info *parent, const char *name, part.size = length; part.offset = offset; + guard(mutex)(&master->master.partitions_lock); + if (master->master.unregistering) + return -ENODEV; + child = allocate_partition(parent, &part, -1, offset); if (IS_ERR(child)) return PTR_ERR(child); - mutex_lock(&master->master.partitions_lock); list_add_tail(&child->part.node, &parent->partitions); - mutex_unlock(&master->master.partitions_lock); ret = add_mtd_device(child); if (ret) @@ -295,10 +297,7 @@ int mtd_add_partition(struct mtd_info *parent, const char *name, return 0; err_remove_part: - mutex_lock(&master->master.partitions_lock); list_del(&child->part.node); - mutex_unlock(&master->master.partitions_lock); - free_partition(child); return ret; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 8d10d9d2e830..cd7b4671c456 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -224,6 +224,7 @@ struct mtd_part { * not only the master partition list, but also all * sub-partitions. * @suspended: set to 1 when the device is suspended, 0 otherwise + * @unregistering: removal has started; protected by partitions_lock * * This struct is embedded in mtd_info and contains master-specific * properties/fields. The master is the root MTD device from the MTD partition @@ -233,6 +234,7 @@ struct mtd_master { struct mutex partitions_lock; struct mutex chrdev_lock; unsigned int suspended : 1; + bool unregistering; }; struct mtd_info { --- base-commit: 14b6830335eb6d70dec7a235094d66c22d38eb07 base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes change-id: 20261108-submit-mtd-partition-publication-v1-4629be94d7e6 Best regards, -- James Hilliard