diff options
author | Robert Richter <rrichter@amd.com> | 2023-05-20 00:54:35 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 20:07:23 +0300 |
commit | 9e1e0887ea21e9fef0f1a2a3ad715f9a3aa9535d (patch) | |
tree | 0782b0386c377fa04786368e3461ba5d51ac2af7 /drivers/cxl | |
parent | c88cfbb18a5e498f405836b11f1dd31c54d7a7de (diff) | |
download | linux-9e1e0887ea21e9fef0f1a2a3ad715f9a3aa9535d.tar.xz |
cxl/port: Fix NULL pointer access in devm_cxl_add_port()
commit a70fc4ed20a6118837b0aecbbf789074935f473b upstream.
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: f3cd264c4ec1 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cxl')
-rw-r--r-- | drivers/cxl/core/port.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 9de8336d7637..bd4142431980 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -717,11 +717,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", |