Commit db4eff3b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Yongqiang Liu
Browse files

block: fix busy device checking in blk_drop_partitions 

mainline inclusion
from mainline-v5.7-rc1
commit d3ef5536
category: bugfix
bugzilla: 186898, https://gitee.com/openeuler/kernel/issues/I5ALFU


CVE: NA

--------------------------------

bd_super is only set by get_tree_bdev and mount_bdev, and thus not by
other openers like btrfs or the XFS realtime and log devices, as well as
block devices directly opened from user space.  Check bd_openers
instead.

Fixes: 77032ca6 ("Return EBUSY from BLKRRPART for mounted whole-dev fs")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent 79fe6f9c

block/partition-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static int drop_partitions(struct gendisk *disk, struct block_device *bdev) 
	struct hd_struct *part;

	int res;



	if (bdev->bd_part_count || bdev->bd_super)

	if (bdev->bd_part_count || bdev->bd_openers)

		return -EBUSY;

	res = invalidate_partition(disk, 0);

	if (res)