Unverified Commit 52ea38da authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10226 cxl/region: Fix memregion leaks in devm_cxl_add_region() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LDEFKOZNBOYU325DLJOCHX4MSRZYHEWQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD05U 
 
Link:https://gitee.com/openeuler/kernel/pulls/10226

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 593dd680 814f494f

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);