ubi: fix race between ctrl_cdev_ioctl and ubi_cdev_ioctl
Subsystems (2)
v2 cover ubi: fix race between ctrl_cdev_ioctl and ubi_cdev_ioctl
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.
ubi_attach_mtd_dev in ctrl_cdev_ioctl may be race with ubi_create_volume and ubi_remove_volume in ubi_cdev_ioctl. Because ubi_attach_mtd_dev has similar ubi_free_volume and ubi_open_volume. These two functions are called in uif_init and uif_close, and we'll fix both races in this patch set.
Another function in ctrl_cdev_ioctl, ubi_detach_mtd_dev, uses reference counting and ubi_devices_lock to avoid race in concurrency cases, so we do not need to fix it.
V1->V2:
Add race in uif_close
Baokun Li (2):
ubi: fix race between volume operations and uif_init
ubi: fix race between volume operations and uif_close
drivers/mtd/ubi/build.c | 5 +++++ 1 file changed, 5 insertions(+)
Signature · 1 line
2.31.1
PATCH v2 1/2 ubi: fix race between volume operations and uif_init
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 following race could cause the use-after-free problem:
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
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. However, volume addition and deletion operations are performed in both ctrl_cdev_ioctl and ubi_cdev_ioctl. When these operations are performed concurrently in both ioctl, a race condition may be triggered.The UAF stack above is one such case.
To solve this problem, add spin_lock(&ubi->volumes_lock) to ctrl_cdev_ioctl where volumes are added and deleted.
--- drivers/mtd/ubi/build.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/ubi/build.c +3 -0
@@ -467,6 +467,7 @@ static int uif_init(struct ubi_device *ubi)if (err) goto out_unreg; +spin_lock (&ubi->volumes_lock);for (i =0 ; i < ubi->vtbl_slots; i++)if (ubi->volumes[i]) { err =ubi_add_volume (ubi, ubi->volumes[i]);
@@ -475,11 +476,13 @@ static int uif_init(struct ubi_device *ubi) goto out_volumes; } } +spin_unlock (&ubi->volumes_lock);return 0 ; out_volumes:kill_volumes (ubi); +spin_unlock (&ubi->volumes_lock);cdev_device_del (&ubi->cdev, &ubi->dev); out_unreg:unregister_chrdev_region (ubi->cdev.dev, ubi->vtbl_slots +1 );
Signature · 1 line
2.31.1
PATCH v2 2/2 ubi: fix race between volume operations and uif_close
In reply to Baokun LiKASAN reported a UAF about ubi:
==================================================================
BUG: KASAN: use-after-free in kobject_get+0x44/0xd0 Write of size 4 at addr ffff8881216e5038 by task ubirmvol/18988 [...] Call Trace: kobject_get+0x44/0xd0 get_device+0x25/0x40 ubi_open_volume+0x22c/0x490 [ubi] ubi_cdev_ioctl+0x300/0x11a0 [ubi] Allocated by task 18850: ubi_read_volume_table+0x676/0x1330 [ubi] ubi_attach+0xd13/0x2460 [ubi] ubi_attach_mtd_dev+0xafa/0x17b0 [ubi] ctrl_cdev_ioctl+0x248/0x2b0 [ubi] Freed by task 18850: kfree+0xa2/0x490 device_release+0x65/0x130 kobject_put+0x17b/0x330 device_unregister+0x39/0x90 uif_close+0x61/0xc0 [ubi] ubi_attach_mtd_dev+0xdd2/0x17b0 [ubi] ctrl_cdev_ioctl+0x248/0x2b0 [ubi] [...] ==================================================================
The following race could cause the use-after-free problem:
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 freeTo solve this problem, add spin_lock(&ubi->volumes_lock) in uif_close.
--- drivers/mtd/ubi/build.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mtd/ubi/build.c +2 -0
@@ -501,7 +501,9 @@ static int uif_init(struct ubi_device *ubi)*/ static void uif_close (struct ubi_device *ubi) { +spin_lock (&ubi->volumes_lock);kill_volumes (ubi); +spin_unlock (&ubi->volumes_lock);cdev_device_del (&ubi->cdev, &ubi->dev);unregister_chrdev_region (ubi->cdev.dev, ubi->vtbl_slots +1 ); }
Signature · 1 line
2.31.1