This is a note to let you know that I've just added the patch titled
cxl/port: Fix NULL pointer access in devm_cxl_add_port()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a70fc4ed20a6118837b0aecbbf789074935f473b Mon Sep 17 00:00:00 2001
From: Robert Richter <rrichter@xxxxxxx>
Date: Fri, 19 May 2023 23:54:35 +0200
Subject: cxl/port: Fix NULL pointer access in devm_cxl_add_port()
From: Robert Richter <rrichter@xxxxxxx>
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@xxxxxxx>
Reviewed-by: Dave Jiang <dave.jiang@xxxxxxxxx>
Link: https://lore.kernel.org/r/20230519215436.3394532-1-rrichter@xxxxxxx
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/cxl/core/port.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -717,11 +717,10 @@ struct cxl_port *devm_cxl_add_port(struc
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",
Patches currently in stable-queue which might be from rrichter@xxxxxxx are
queue-6.1/cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch
queue-6.1/cxl-unify-debug-messages-when-calling-devm_cxl_add_p.patch
queue-6.1/cxl-mem-move-devm_cxl_add_endpoint-from-cxl_core-to-.patch
