Commit 814f494f authored by Li Zhijian's avatar Li Zhijian Committed by Pu Lehui
Browse files

cxl/region: Fix memregion leaks in devm_cxl_add_region() 

stable inclusion
from stable-v6.6.35
commit d8316838aa0686da63a8be4194b7a17b0103ae4a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAD05U
CVE: CVE-2024-40936

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d8316838aa06



--------------------------------

[ Upstream commit 49ba7b515c4c0719b866d16f068e62d16a8a3dd1 ]

Move the mode verification to __create_region() before allocating the
memregion to avoid the memregion leaks.

Fixes: 6e099264 ("cxl/region: Add volatile region creation support")
Signed-off-by: default avatarLi Zhijian <lizhijian@fujitsu.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20240507053421.456439-1-lizhijian@fujitsu.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
parent b53be02f

drivers/cxl/core/region.c

+9 −9
Original line number Diff line number Diff line
@@ -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);