Commit a70fc4ed authored May 19, 2023 by Robert Richter Committed by Dan Williams May 19, 2023

cxl/port: Fix NULL pointer access in devm_cxl_add_port()



In devm_cxl_add_port() the port creation may fail and its associated
pointer does not contain a valid address. During error message
generation this invalid port address is used. Fix that wrong address
access.

Fixes: f3cd264c ("cxl: Unify debug messages when calling devm_cxl_add_port()")
Signed-off-by: Robert Richter <rrichter@amd.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20230519215436.3394532-1-rrichter@amd.com


Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent e764f122

drivers/cxl/core/port.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -750,11 +750,10 @@ struct cxl_port devm_cxl_add_port(struct device host, struct device *uport,

		parent_port = parent_dport ? parent_dport->port : NULL;
		if (IS_ERR(port)) {
		dev_dbg(uport, "Failed to add %s%s%s%s: %ld\n",
		dev_name(&port->dev),
		parent_port ? " to " : "",
		dev_dbg(uport, "Failed to add%s%s%s: %ld\n",
		parent_port ? " port to " : "",
		parent_port ? dev_name(&parent_port->dev) : "",
		parent_port ? "" : " (root port)",
		parent_port ? "" : " root port",
		PTR_ERR(port));
		} else {
		dev_dbg(uport, "%s added%s%s%s\n",