From patchwork Thu Oct 21 12:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yebin (H)" X-Patchwork-Id: 12574927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5B57C433EF for ; Thu, 21 Oct 2021 12:39:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FDDD611F2 for ; Thu, 21 Oct 2021 12:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230444AbhJUMls (ORCPT ); Thu, 21 Oct 2021 08:41:48 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:14838 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbhJUMlr (ORCPT ); Thu, 21 Oct 2021 08:41:47 -0400 Received: from dggeme754-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4HZn3r5sv0z90Hg; Thu, 21 Oct 2021 20:34:32 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggeme754-chm.china.huawei.com (10.3.19.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Thu, 21 Oct 2021 20:39:29 +0800 From: Ye Bin To: , , , CC: , Ye Bin Subject: [PATCH -next v2 1/2] nbd: Fix incorrect error handle when first_minor big than '0xff' in nbd_dev_add Date: Thu, 21 Oct 2021 20:52:30 +0800 Message-ID: <20211021125231.916081-2-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211021125231.916081-1-yebin10@huawei.com> References: <20211021125231.916081-1-yebin10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggeme754-chm.china.huawei.com (10.3.19.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org If first_minor big than '0xff' 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 --- 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 c38971874ea3..6b6ae08ec93b 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1820,7 +1820,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) disk->first_minor = index << part_shift; if (disk->first_minor > 0xff) { err = -EINVAL; - goto out_free_idr; + goto out_err_disk; } disk->minors = 1 << part_shift;