2023-05-19 22:02:23

by Robert Richter

Subject: [PATCH] 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: f3cd264c4ec1 ("cxl: Unify debug messages when calling devm_cxl_add_port()")
Signed-off-by: Robert Richter <[email protected]>
---
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

2023-05-19 23:39:43

by Dave Jiang

Subject: Re: [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port()

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 <[email protected]>

Reviewed-by: Dave Jiang <[email protected]>

> ---
> 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

2023-05-20 01:25:03

by Dan Williams

Subject: RE: [PATCH] cxl/port: Fix NULL pointer access in devm_cxl_add_port()

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 <[email protected]>
> ---
> 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.