OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e764f12
)
cxl/port: Fix NULL pointer access in devm_cxl_add_port()
author
Robert Richter
<rrichter@amd.com>
Fri, 19 May 2023 21:54:35 +0000
(23:54 +0200)
committer
Dan Williams
<dan.j.williams@intel.com>
Sat, 20 May 2023 00:47:01 +0000
(17:47 -0700)
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>
drivers/cxl/core/port.c
patch
|
blob
|
history
diff --git
a/drivers/cxl/core/port.c
b/drivers/cxl/core/port.c
index
da20684
..
e7c284c
100644
(file)
--- a/
drivers/cxl/core/port.c
+++ b/
drivers/cxl/core/port.c
@@
-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",