Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2494521pxb; Fri, 29 Oct 2021 02:32:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfpysxc56bLSq6Rq+EVZsCowHUsVBg0vN/3QlgWPZMoubh1A5F7dmVtQupnemkOhEKdJfB X-Received: by 2002:a05:6a00:26db:b0:47b:d469:5be0 with SMTP id p27-20020a056a0026db00b0047bd4695be0mr9711287pfw.64.1635499957330; Fri, 29 Oct 2021 02:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635499957; cv=none; d=google.com; s=arc-20160816; b=qj4T+yV3hk5qoR8FBr/2h3upcTZcH5mbXpi1LEXPYKjN718mHdzVx9bnb/I2kwMZ3Q VLxAPIn22XFpFGblQFHJcPS4SSg5N72R10Cn7WF94rMLq5XaAYIUXrlXT24b/eJS8ATD pYoMfHmePECN4eT/Tgu1R4XdM2+O0yFHpHm7MaBEXvdlJxrT0NSSZ6fc2t5MdbRHHibk k7ZSbG3fm09ZVKFZh4ijSsMO2SmhdvKUfTW6eN+j2KaXYcEgxvgn8oog0GaJ7Vb3Wsw7 I7+H41uiuaTmLyWmZ674Lc/iqJh10SitVhsTmCHKCQvlwgHuStLbO+d89egliNojWyF8 2b4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=yc5eQYfXouaYZNwawsCcXk3+AbT0YQgCaNDx6HGprcM=; b=AqsOOB0Bbq0z152yRAduK4cgueGnaaP4wpq9OuHW8WSZRY8CcIFhstqbzYPAO2waq7 fumvg69SHaUmp/6jGvXAIz0HoY5VaXb5AVzyrea/pWV1QXD31ewrkDUo+8s+dJfXUaRC T+oSmSeEI2Z4srAgKtklKdmQWJ2nxiYcOzTMQSR5ZQeO2q7Sy9LOHO527RccK8Xh/v5g VOJpSZrWELLIpFJ7Zzpi9QJ2MKOiAOjuIaLjeItzp9fui3UDfV+FQP6bgC0YHPZNOCHg dDcya+InABIOpFHo8jns4+wdomAfUDyctt3VWJDeuA5nrc0gzvRyF97tY83ZixMwTDhk EAHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d5si4138145plr.346.2021.10.29.02.32.10; Fri, 29 Oct 2021 02:32:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231601AbhJ2JcK (ORCPT + 99 others); Fri, 29 Oct 2021 05:32:10 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:14878 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231537AbhJ2JcJ (ORCPT ); Fri, 29 Oct 2021 05:32:09 -0400 Received: from dggeme754-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4HgcZj0lJLz90RS; Fri, 29 Oct 2021 17:29:33 +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; Fri, 29 Oct 2021 17:29:37 +0800 From: Ye Bin To: , , , CC: , Ye Bin Subject: [PATCH -next v3 1/2] nbd: Fix incorrect error handle when first_minor big than '0xff' in nbd_dev_add Date: Fri, 29 Oct 2021 17:42:27 +0800 Message-ID: <20211029094228.1853434-2-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029094228.1853434-1-yebin10@huawei.com> References: <20211029094228.1853434-1-yebin10@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggeme754-chm.china.huawei.com (10.3.19.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 b47b2a87ae8f..096883ab9b76 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 > 0xff) { err = -EINVAL; - goto out_free_idr; + goto out_err_disk; } disk->minors = 1 << part_shift; -- 2.31.1