From: Ye Bin <yebin10@huawei.com>
Date: Tue, 2 Nov 2021 01:52:36 +0000 (+0800)
Subject: nbd: Fix incorrect error handle when first_minor is illegal in nbd_dev_add
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=69beb62ff0d1723a750eebe1c4d01da573d7cd19;p=linux.git

nbd: Fix incorrect error handle when first_minor is illegal in nbd_dev_add

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>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a5e3ee28006f9..f201c40d1dc9f 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1814,7 +1814,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;