Skip to content

Commit 3cbf0e3

Browse files
LiBaokun96richardweinberger
authored andcommitted
ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl
Hulk Robot reported a KASAN report about use-after-free: ================================================================== BUG: KASAN: use-after-free in __list_del_entry_valid+0x13d/0x160 Read of size 8 at addr ffff888035e37d98 by task ubiattach/1385 [...] Call Trace: klist_dec_and_del+0xa7/0x4a0 klist_put+0xc7/0x1a0 device_del+0x4d4/0xed0 cdev_device_del+0x1a/0x80 ubi_attach_mtd_dev+0x2951/0x34b0 [ubi] ctrl_cdev_ioctl+0x286/0x2f0 [ubi] Allocated by task 1414: device_add+0x60a/0x18b0 cdev_device_add+0x103/0x170 ubi_create_volume+0x1118/0x1a10 [ubi] ubi_cdev_ioctl+0xb7f/0x1ba0 [ubi] Freed by task 1385: cdev_device_del+0x1a/0x80 ubi_remove_volume+0x438/0x6c0 [ubi] ubi_cdev_ioctl+0xbf4/0x1ba0 [ubi] [...] ================================================================== The lock held by ctrl_cdev_ioctl is ubi_devices_mutex, but the lock held by ubi_cdev_ioctl is ubi->device_mutex. Therefore, the two locks can be concurrent. ctrl_cdev_ioctl contains two operations: ubi_attach and ubi_detach. ubi_detach is bug-free because it uses reference counting to prevent concurrency. However, uif_init and uif_close in ubi_attach may race with ubi_cdev_ioctl. uif_init will race with ubi_cdev_ioctl as in the following stack. cpu1 cpu2 cpu3 _______________________|________________________|______________________ ctrl_cdev_ioctl ubi_attach_mtd_dev uif_init ubi_cdev_ioctl ubi_create_volume cdev_device_add ubi_add_volume // sysfs exist kill_volumes ubi_cdev_ioctl ubi_remove_volume cdev_device_del // first free ubi_free_volume cdev_del // double free cdev_device_del And uif_close will race with ubi_cdev_ioctl as in the following stack. cpu1 cpu2 cpu3 _______________________|________________________|______________________ ctrl_cdev_ioctl ubi_attach_mtd_dev uif_init ubi_cdev_ioctl ubi_create_volume cdev_device_add ubi_debugfs_init_dev //error goto out_uif; uif_close kill_volumes ubi_cdev_ioctl ubi_remove_volume cdev_device_del // first free ubi_free_volume // double free The cause of this problem is that commit 714fb87 make device "available" before it becomes accessible via sysfs. Therefore, we roll back the modification. We will fix the race condition between ubi device creation and udev by removing ubi_get_device in vol_attribute_show and dev_attribute_show.This avoids accessing uninitialized ubi_devices[ubi_num]. ubi_get_device is used to prevent devices from being deleted during sysfs execution. However, now kernfs ensures that devices will not be deleted before all reference counting are released. The key process is shown in the following stack. device_del device_remove_attrs device_remove_groups sysfs_remove_groups sysfs_remove_group remove_files kernfs_remove_by_name kernfs_remove_by_name_ns __kernfs_remove kernfs_drain Fixes: 714fb87 ("ubi: Fix race condition between ubi device creation and udev") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Baokun Li <libaokun1@huawei.com> Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent aa39cc6 commit 3cbf0e3

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

drivers/mtd/ubi/build.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@ static ssize_t dev_attribute_show(struct device *dev,
351351
* we still can use 'ubi->ubi_num'.
352352
*/
353353
ubi = container_of(dev, struct ubi_device, dev);
354-
ubi = ubi_get_device(ubi->ubi_num);
355-
if (!ubi)
356-
return -ENODEV;
357354

358355
if (attr == &dev_eraseblock_size)
359356
ret = sprintf(buf, "%d\n", ubi->leb_size);
@@ -382,7 +379,6 @@ static ssize_t dev_attribute_show(struct device *dev,
382379
else
383380
ret = -EINVAL;
384381

385-
ubi_put_device(ubi);
386382
return ret;
387383
}
388384

@@ -979,9 +975,6 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
979975
goto out_detach;
980976
}
981977

982-
/* Make device "available" before it becomes accessible via sysfs */
983-
ubi_devices[ubi_num] = ubi;
984-
985978
err = uif_init(ubi);
986979
if (err)
987980
goto out_detach;
@@ -1026,6 +1019,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
10261019
wake_up_process(ubi->bgt_thread);
10271020
spin_unlock(&ubi->wl_lock);
10281021

1022+
ubi_devices[ubi_num] = ubi;
10291023
ubi_notify_all(ubi, UBI_VOLUME_ADDED, NULL);
10301024
return ubi_num;
10311025

@@ -1034,7 +1028,6 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
10341028
out_uif:
10351029
uif_close(ubi);
10361030
out_detach:
1037-
ubi_devices[ubi_num] = NULL;
10381031
ubi_wl_close(ubi);
10391032
ubi_free_all_volumes(ubi);
10401033
vfree(ubi->vtbl);

drivers/mtd/ubi/vmt.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,11 @@ static ssize_t vol_attribute_show(struct device *dev,
5656
{
5757
int ret;
5858
struct ubi_volume *vol = container_of(dev, struct ubi_volume, dev);
59-
struct ubi_device *ubi;
60-
61-
ubi = ubi_get_device(vol->ubi->ubi_num);
62-
if (!ubi)
63-
return -ENODEV;
59+
struct ubi_device *ubi = vol->ubi;
6460

6561
spin_lock(&ubi->volumes_lock);
6662
if (!ubi->volumes[vol->vol_id]) {
6763
spin_unlock(&ubi->volumes_lock);
68-
ubi_put_device(ubi);
6964
return -ENODEV;
7065
}
7166
/* Take a reference to prevent volume removal */
@@ -103,7 +98,6 @@ static ssize_t vol_attribute_show(struct device *dev,
10398
vol->ref_count -= 1;
10499
ubi_assert(vol->ref_count >= 0);
105100
spin_unlock(&ubi->volumes_lock);
106-
ubi_put_device(ubi);
107101
return ret;
108102
}
109103

0 commit comments

Comments
 (0)