Messages in this thread Patch in this message | | | From | Li Zhijian <> | Subject | [PATCH] cxl/region: Fix memregion leaks in devm_cxl_add_region() | Date | Sun, 28 Apr 2024 13:37:15 +0800 |
| |
Move memregion_free(id) out of cxl_region_alloc() and explicately free memregion in devm_cxl_add_region() error path.
After cxl_region_alloc() succeed, memregion will be freed by cxl_region_type.release()
Fixes: 6e099264185d ("cxl/region: Add volatile region creation support") Signed-off-by: Li Zhijian <lizhijian@fujitsu.com> --- drivers/cxl/core/region.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 812b2948b6c6..8535718a20f0 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2250,10 +2250,8 @@ static struct cxl_region *cxl_region_alloc(struct cxl_root_decoder *cxlrd, int i struct device *dev; cxlr = kzalloc(sizeof(*cxlr), GFP_KERNEL); - if (!cxlr) { - memregion_free(id); + if (!cxlr) return ERR_PTR(-ENOMEM); - } dev = &cxlr->dev; device_initialize(dev); @@ -2358,12 +2356,15 @@ static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd, break; default: dev_err(&cxlrd->cxlsd.cxld.dev, "unsupported mode %d\n", mode); + memregion_free(id); return ERR_PTR(-EINVAL); } cxlr = cxl_region_alloc(cxlrd, id); - if (IS_ERR(cxlr)) + if (IS_ERR(cxlr)) { + memregion_free(id); return cxlr; + } cxlr->mode = mode; cxlr->type = type; -- 2.29.2
| |