From: Ye Bin <yebin10@huawei.com>
To: <josef@toxicpanda.com>, <axboe@kernel.dk>,
<linux-block@vger.kernel.org>, <nbd@other.debian.org>
Cc: <linux-kernel@vger.kernel.org>, Ye Bin <yebin10@huawei.com>
Subject: [PATCH -next v4 3/4] nbd: Fix incorrect error handle when first_minor is illegal in nbd_dev_add
Date: Tue, 2 Nov 2021 09:52:36 +0800 [thread overview]
Message-ID: <20211102015237.2309763-4-yebin10@huawei.com> (raw)
In-Reply-To: <20211102015237.2309763-1-yebin10@huawei.com>
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>
---
drivers/block/nbd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index cc32b5bc0f49..88dc0c49631c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1809,7 +1809,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;
--
2.31.1
next prev parent reply other threads:[~2021-11-02 1:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 1:52 [PATCH -next v4 0/4] Fix hungtask when nbd_config_put and sanity check for first_minor Ye Bin
2021-11-02 1:52 ` [PATCH -next v4 1/4] nbd: fix max value for 'first_minor' Ye Bin
2021-11-02 1:52 ` [PATCH -next v4 2/4] nbd: fix possible overflow for 'first_minor' in nbd_dev_add() Ye Bin
2021-11-02 1:52 ` Ye Bin [this message]
2021-11-02 1:52 ` [PATCH -next v4 4/4] nbd: Fix hungtask when nbd_config_put Ye Bin
2021-11-02 13:04 ` [PATCH -next v4 0/4] Fix hungtask when nbd_config_put and sanity check for first_minor Josef Bacik
2021-11-02 16:50 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211102015237.2309763-4-yebin10@huawei.com \
--to=yebin10@huawei.com \
--cc=axboe@kernel.dk \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@other.debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.