Commit a0a6314a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: fix leaking minors of hidden disks 



The major/minor of a hidden gendisk is not propagated to the block
device because it is never registered using bdev_add.  But the lack of
bd_dev also causes the dynamic major minor number not to be freed.
Assign bd_dev manually to ensure the dynamic major minor gets freed.

Based on a patch by Keith Busch.

Fixes: 8ddcd653 ("block: introduce GENHD_FL_HIDDEN")
Reported-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarDaniel Wagner <dwagner@suse.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20221010131857.748129-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ca5eebda

block/genhd.c

+7 −0
Original line number Diff line number Diff line
@@ -507,6 +507,13 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 
		 */

		dev_set_uevent_suppress(ddev, 0);

		disk_uevent(disk, KOBJ_ADD);

	} else {

		/*

		 * Even if the block_device for a hidden gendisk is not

		 * registered, it needs to have a valid bd_dev so that the

		 * freeing of the dynamic major works.

		 */

		disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);

	}



	disk_update_readahead(disk);