From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CC12143873; Wed, 19 Jun 2024 13:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802161; cv=none; b=h1P7WYE/uEtZ2SV8pAaEdoixJSiqvGtn+oVDXdmXwd0/g6kpE1kOeIfaxRza6K55n8fqUqWYxCnSQjnyWlqzgFsp6h4iTzRS6Vx/fvWyxMMBCOl3YllEOu9M9f/MSWhsmJKLA8qkzaBFFnPT31qi0NKKncoGfxJ808UlziltrcQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802161; c=relaxed/simple; bh=UXGTAQh/dIcduBo7ktV+C2Zce0tmwAXRCDMic+hrVmc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FEO1LNkhuR7RmgFvaE0W6sZhOkmGbsKHPd/29aGPIlQanru0clQESb/tnkxhRoxO9hxLXDAEIIWB70tHW/Q8ZKjg8p5kRIoyc6yVE5Y0pjAapfrQSANdq/hdqHCUlRmN5VibKBVsmwb1OEoFfpCOfzFTTD9zuI/yjyAErwvBRaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EWP9af+b; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EWP9af+b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46703C2BBFC; Wed, 19 Jun 2024 13:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802160; bh=UXGTAQh/dIcduBo7ktV+C2Zce0tmwAXRCDMic+hrVmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EWP9af+b8wAU9Ve+A2KoH1WxGCiBr1YSUasj4RRwoMYgxTkcN7MrGKp6ALGlReNKS jd5P+WGs3KZrbizbGwJ/esiNNRe39S9VNwryWdegKzJwJ5HcHERY8WRkz8T3MLfgbq 7ztRe7+DBtZ9or2zwq0SJ/lbYIih0zYvPrHk94rI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li Zhijian , Dan Williams , Dave Jiang , Sasha Levin Subject: [PATCH 6.6 102/267] cxl/region: Fix memregion leaks in devm_cxl_add_region() Date: Wed, 19 Jun 2024 14:54:13 +0200 Message-ID: <20240619125610.268796556@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125606.345939659@linuxfoundation.org> References: <20240619125606.345939659@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Zhijian [ Upstream commit 49ba7b515c4c0719b866d16f068e62d16a8a3dd1 ] Move the mode verification to __create_region() before allocating the memregion to avoid the memregion leaks. Fixes: 6e099264185d ("cxl/region: Add volatile region creation support") Signed-off-by: Li Zhijian Reviewed-by: Dan Williams Link: https://lore.kernel.org/r/20240507053421.456439-1-lizhijian@fujitsu.com Signed-off-by: Dave Jiang Signed-off-by: Sasha Levin --- drivers/cxl/core/region.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index c65ab42546238..7a646fed17211 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2186,15 +2186,6 @@ static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd, struct device *dev; int rc; - switch (mode) { - case CXL_DECODER_RAM: - case CXL_DECODER_PMEM: - break; - default: - dev_err(&cxlrd->cxlsd.cxld.dev, "unsupported mode %d\n", mode); - return ERR_PTR(-EINVAL); - } - cxlr = cxl_region_alloc(cxlrd, id); if (IS_ERR(cxlr)) return cxlr; @@ -2245,6 +2236,15 @@ static struct cxl_region *__create_region(struct cxl_root_decoder *cxlrd, { int rc; + switch (mode) { + case CXL_DECODER_RAM: + case CXL_DECODER_PMEM: + break; + default: + dev_err(&cxlrd->cxlsd.cxld.dev, "unsupported mode %d\n", mode); + return ERR_PTR(-EINVAL); + } + rc = memregion_alloc(GFP_KERNEL); if (rc < 0) return ERR_PTR(rc); -- 2.43.0