summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorYe Bin <yebin10@huawei.com>2021-11-02 04:52:36 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-13 21:58:59 +0300
commit694b5a32c162dd5298c07efd19719cac629806e0 (patch)
tree4e303bc29bd454a36fe2c52790bfc7a22810081c /drivers/block
parent3e526e9ae0e4d35765a4a5344695ded0c60c6223 (diff)
downloadlinux-694b5a32c162dd5298c07efd19719cac629806e0.tar.xz
nbd: Fix incorrect error handle when first_minor is illegal in nbd_dev_add
[ Upstream commit 69beb62ff0d1723a750eebe1c4d01da573d7cd19 ] If first_minor is illegal will goto out_free_idr label, this will miss cleanup disk. Fixes: b1a811633f73 ("block: nbd: add sanity check for first_minor") Signed-off-by: Ye Bin <yebin10@huawei.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Link: https://lore.kernel.org/r/20211102015237.2309763-4-yebin10@huawei.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 946fdc1734f4..4ae6c221b36d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1755,7 +1755,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs)
disk->first_minor = index << part_shift;
if (disk->first_minor < index || disk->first_minor > MINORMASK) {
err = -EINVAL;
- goto out_free_idr;
+ goto out_err_disk;
}
disk->minors = 1 << part_shift;