Skip to content

Commit 8973665

Browse files
jankaraaxboe
authored andcommitted
genhd: Fix use after free in __blkdev_get()
When two blkdev_open() calls race with device removal and recreation, __blkdev_get() can use looked up gendisk after it is freed: CPU0 CPU1 CPU2 del_gendisk(disk); bdev_unhash_inode(inode); blkdev_open() blkdev_open() bdev = bd_acquire(inode); - creates and returns new inode bdev = bd_acquire(inode); - returns the same inode __blkdev_get(devt) __blkdev_get(devt) disk = get_gendisk(devt); - got structure of device going away <finish device removal> <new device gets created under the same device number> disk = get_gendisk(devt); - got new device structure if (!bdev->bd_openers) { does the first open } if (!bdev->bd_openers) - false } else { put_disk_and_module(disk) - remember this was old device - this was last ref and disk is now freed } disk_unblock_events(disk); -> oops Fix the problem by making sure we drop reference to disk in __blkdev_get() only after we are really done with it. Reported-by: Hou Tao <[email protected]> Tested-by: Hou Tao <[email protected]> Signed-off-by: Jan Kara <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 9df6c29 commit 8973665

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

fs/block_dev.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
14091409
int ret;
14101410
int partno;
14111411
int perm = 0;
1412+
bool first_open = false;
14121413

14131414
if (mode & FMODE_READ)
14141415
perm |= MAY_READ;
@@ -1435,6 +1436,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
14351436
disk_block_events(disk);
14361437
mutex_lock_nested(&bdev->bd_mutex, for_part);
14371438
if (!bdev->bd_openers) {
1439+
first_open = true;
14381440
bdev->bd_disk = disk;
14391441
bdev->bd_queue = disk->queue;
14401442
bdev->bd_contains = bdev;
@@ -1520,14 +1522,15 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
15201522
if (ret)
15211523
goto out_unlock_bdev;
15221524
}
1523-
/* only one opener holds refs to the module and disk */
1524-
put_disk_and_module(disk);
15251525
}
15261526
bdev->bd_openers++;
15271527
if (for_part)
15281528
bdev->bd_part_count++;
15291529
mutex_unlock(&bdev->bd_mutex);
15301530
disk_unblock_events(disk);
1531+
/* only one opener holds refs to the module and disk */
1532+
if (!first_open)
1533+
put_disk_and_module(disk);
15311534
return 0;
15321535

15331536
out_clear:

0 commit comments

Comments
 (0)