cxl/region: Fix an ERR_PTR() vs NULL bug

Dan Carpenter · davejiang · commit 49d6e658e758 · 2025-07-18T15:05:39.000-07:00
The __cxl_decoder_detach() function is expected to return NULL on error but this error path accidentally returns an error pointer. It could potentially lead to an error pointer dereference in the caller. Change it to return NULL. Fixes: b3a8822 ("cxl/region: Consolidate cxl_decoder_kill_region() and cxl_region_detach()") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/7def7da0-326a-410d-8c92-718c8963c0a2@sabinyo.mountain Signed-off-by: Dave Jiang <dave.jiang@intel.com>
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
@@ -2108,7 +2108,7 @@ __cxl_decoder_detach(struct cxl_region *cxlr,
 		if (pos >= p->interleave_ways) {
 			dev_dbg(&cxlr->dev, "position %d out of range %d\n",
 				pos, p->interleave_ways);
-			return ERR_PTR(-ENXIO);
+			return NULL;
 		}
 
 		if (!p->targets[pos])

Original file line number	Diff line number	Diff line change
`@@ -2108,7 +2108,7 @@ __cxl_decoder_detach(struct cxl_region *cxlr,`
`2108`	`2108`	`if (pos >= p->interleave_ways) {`
`2109`	`2109`	`dev_dbg(&cxlr->dev, "position %d out of range %d\n",`
`2110`	`2110`	`pos, p->interleave_ways);`
`2111`		`- return ERR_PTR(-ENXIO);`
	`2111`	`+ return NULL;`
`2112`	`2112`	`}`
`2113`	`2113`
`2114`	`2114`	`if (!p->targets[pos])`