From: Greg Kroah-Hartman Date: Mon, 27 Nov 2023 12:43:08 +0000 (+0000) Subject: 6.1-stable patches X-Git-Tag: v4.14.331~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5883dde250e154dff42503741f314872f9bfff53;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch --- diff --git a/queue-6.1/cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch b/queue-6.1/cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch new file mode 100644 index 00000000000..50fee0718c5 --- /dev/null +++ b/queue-6.1/cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch @@ -0,0 +1,41 @@ +From a70fc4ed20a6118837b0aecbbf789074935f473b Mon Sep 17 00:00:00 2001 +From: Robert Richter +Date: Fri, 19 May 2023 23:54:35 +0200 +Subject: cxl/port: Fix NULL pointer access in devm_cxl_add_port() + +From: Robert Richter + +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 +Reviewed-by: Dave Jiang +Link: https://lore.kernel.org/r/20230519215436.3394532-1-rrichter@amd.com +Signed-off-by: Dan Williams +Signed-off-by: Greg Kroah-Hartman +--- + 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", diff --git a/queue-6.1/series b/queue-6.1/series index cc1c1d551a1..33d9f950dca 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -364,3 +364,4 @@ powerpc-powernv-fix-fortify-source-warnings-in-opal-prd.c.patch tracing-have-trace_event_file-have-ref-counters.patch input-xpad-add-vid-for-turtle-beach-controllers.patch mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch +cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch