From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E02DC001DE for ; Sun, 2 Jul 2023 19:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232783AbjGBTrK (ORCPT ); Sun, 2 Jul 2023 15:47:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232708AbjGBTpW (ORCPT ); Sun, 2 Jul 2023 15:45:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 531584205; Sun, 2 Jul 2023 12:42:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2840B60C96; Sun, 2 Jul 2023 19:42:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FF06C433CA; Sun, 2 Jul 2023 19:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326954; bh=p//87+KLbGKiTtxFDtRhZha52okbV6Mmaq31tSEbZYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZY3VlmvBOV7O1MxNxkmSaVa6pTD9VNfzDGCg0euyx7lAaFJBCVNAwgavF54lhBWhG 6A6cEMU0Fv4q9kOunf2hjNDsOE7mfy+dd9aW5HGt3htw5L2pW2wxh0il8yjVOh9pih 2OotHV5gpOCVf8N8+sAp5vsD1DC08/GSX+LflHSIpGMGBrz9eXAzm8kiwXSRVpq8Ws XNO1jPqXzUGiPoBw2kyHTvkPspd+HNEszi6XkO8fCrFEhBX4wjBUnkUu5NnGMPoYVZ z6wfgeNNwBJtdwfYaDoSj2dLxewLGXWfW54j7qERGf+ItiQ7eQvDuxM3XAHHnXPd5a K4aFOQvt1tkLg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhong Jinghua , Christoph Hellwig , Jens Axboe , Sasha Levin , josef@toxicpanda.com, linux-block@vger.kernel.org, nbd@other.debian.org Subject: [PATCH AUTOSEL 4.14 2/5] nbd: Add the maximum limit of allocated index in nbd_dev_add Date: Sun, 2 Jul 2023 15:42:27 -0400 Message-Id: <20230702194230.1779535-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702194230.1779535-1-sashal@kernel.org> References: <20230702194230.1779535-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.320 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhong Jinghua [ Upstream commit f12bc113ce904777fd6ca003b473b427782b3dde ] If the index allocated by idr_alloc greater than MINORMASK >> part_shift, the device number will overflow, resulting in failure to create a block device. Fix it by imiting the size of the max allocation. Signed-off-by: Zhong Jinghua Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20230605122159.2134384-1-zhongjinghua@huaweicloud.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/nbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index eb2ca7f6ab3ab..33ad48719c124 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1630,7 +1630,8 @@ static int nbd_dev_add(int index) if (err == -ENOSPC) err = -EEXIST; } else { - err = idr_alloc(&nbd_index_idr, nbd, 0, 0, GFP_KERNEL); + err = idr_alloc(&nbd_index_idr, nbd, 0, + (MINORMASK >> part_shift) + 1, GFP_KERNEL); if (err >= 0) index = err; } -- 2.39.2