leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: fix memory leak for elevator on add_disk failure

Browse Source 
The default elevator is allocated in the beginning of device_add_disk(),
however, it's not freed in the following error path.

Fixes: 50e34d7881 ("block: disable the elevator int del_gendisk")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/20221022021615.2756171-1-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Yu Kuai 2022-10-22 10:16:15 +08:00 committed by Jens Axboe
parent 2db96217e7
commit 02341a08c9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/genhd.c
View File

@ -410,9 +410,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
* Otherwise just allocate the device numbers for both the whole device * Otherwise just allocate the device numbers for both the whole device
* and all partitions from the extended dev_t space. * and all partitions from the extended dev_t space.
*/ */
ret = -EINVAL;
if (disk->major) { if (disk->major) {
if (WARN_ON(!disk->minors)) if (WARN_ON(!disk->minors))
return -EINVAL; goto out_exit_elevator;
if (disk->minors > DISK_MAX_PARTS) { if (disk->minors > DISK_MAX_PARTS) {
pr_err("block: can't allocate more than %d partitions\n", pr_err("block: can't allocate more than %d partitions\n",
@ -420,14 +421,14 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
disk->minors = DISK_MAX_PARTS; disk->minors = DISK_MAX_PARTS;
} }
if (disk->first_minor + disk->minors > MINORMASK + 1) if (disk->first_minor + disk->minors > MINORMASK + 1)
return -EINVAL; goto out_exit_elevator;
} else { } else {
if (WARN_ON(disk->minors)) if (WARN_ON(disk->minors))
return -EINVAL; goto out_exit_elevator;
ret = blk_alloc_ext_minor(); ret = blk_alloc_ext_minor();
if (ret < 0) if (ret < 0)
return ret; goto out_exit_elevator;
disk->major = BLOCK_EXT_MAJOR; disk->major = BLOCK_EXT_MAJOR;
disk->first_minor = ret; disk->first_minor = ret;
} }
@ -540,6 +541,9 @@ out_device_del:
out_free_ext_minor: out_free_ext_minor:
if (disk->major == BLOCK_EXT_MAJOR) if (disk->major == BLOCK_EXT_MAJOR)
blk_free_ext_minor(disk->first_minor); blk_free_ext_minor(disk->first_minor);
out_exit_elevator:
if (disk->queue->elevator)
elevator_exit(disk->queue);
return ret; return ret;
} }
EXPORT_SYMBOL(device_add_disk); EXPORT_SYMBOL(device_add_disk);