* [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port()
@ 2023-05-19 21:54 Robert Richter
2023-05-19 23:33 ` Dave Jiang
2023-05-20 0:46 ` Dan Williams
0 siblings, 2 replies; 3+ messages in thread
From: Robert Richter @ 2023-05-19 21:54 UTC (permalink / raw)
To: Alison Schofield, Vishal Verma, Ira Weiny, Ben Widawsky,
Dan Williams, Robert Richter
Cc: linux-cxl, linux-kernel
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>
---
drivers/cxl/core/port.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index da2068475fa2..e7c284c890bc 100644
--- 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",
base-commit: e764f12208b99ac7892c4e3f6bf88d71ca71036f
--
2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port()
2023-05-19 21:54 [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port() Robert Richter
@ 2023-05-19 23:33 ` Dave Jiang
2023-05-20 0:46 ` Dan Williams
1 sibling, 0 replies; 3+ messages in thread
From: Dave Jiang @ 2023-05-19 23:33 UTC (permalink / raw)
To: Robert Richter, Alison Schofield, Vishal Verma, Ira Weiny,
Ben Widawsky, Dan Williams
Cc: linux-cxl, linux-kernel
On 5/19/23 2:54 PM, Robert Richter wrote:
> 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>
> ---
> drivers/cxl/core/port.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index da2068475fa2..e7c284c890bc 100644
> --- 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",
>
> base-commit: e764f12208b99ac7892c4e3f6bf88d71ca71036f
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port()
2023-05-19 21:54 [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port() Robert Richter
2023-05-19 23:33 ` Dave Jiang
@ 2023-05-20 0:46 ` Dan Williams
1 sibling, 0 replies; 3+ messages in thread
From: Dan Williams @ 2023-05-20 0:46 UTC (permalink / raw)
To: Robert Richter, Alison Schofield, Vishal Verma, Ira Weiny,
Ben Widawsky, Dan Williams
Cc: linux-cxl, linux-kernel
Robert Richter wrote:
> 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>
> ---
> drivers/cxl/core/port.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index da2068475fa2..e7c284c890bc 100644
> --- 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));
Looks good, applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-20 0:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-19 21:54 [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port() Robert Richter
2023-05-19 23:33 ` Dave Jiang
2023-05-20 0:46 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®