6.10-stable patches

added patches:
	powercap-intel_rapl-change-an-error-pointer-to-null.patch

diff --git a/queue-6.10/powercap-intel_rapl-change-an-error-pointer-to-null.patch b/queue-6.10/powercap-intel_rapl-change-an-error-pointer-to-null.patch
new file mode 100644 (file)
index 0000000..4f11d16
--- /dev/null
+++ b/queue-6.10/powercap-intel_rapl-change-an-error-pointer-to-null.patch
@@ -0,0 +1,35 @@
+From 6b08b4ee5e60d8789aeb87250f718ef14bebb90e Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@linaro.org>
+Date: Fri, 23 Aug 2024 15:51:36 +0300
+Subject: powercap: intel_rapl: Change an error pointer to NULL
+
+From: Dan Carpenter <dan.carpenter@linaro.org>
+
+commit 6b08b4ee5e60d8789aeb87250f718ef14bebb90e upstream.
+
+The rapl_find_package_domain_cpuslocked() function is supposed to
+return NULL on error.
+
+This new error patch returns ERR_PTR(-EINVAL) but none of the callers
+check for that so it would lead to an Oops.
+
+Fixes: 26096aed255f ("powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs")
+Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
+Link: https://patch.msgid.link/fa719c6a-8d3b-4cca-9b43-bcd477ff6655@stanley.mountain
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/powercap/intel_rapl_common.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/powercap/intel_rapl_common.c
++++ b/drivers/powercap/intel_rapl_common.c
+@@ -2156,7 +2156,7 @@ struct rapl_package *rapl_find_package_d
+                     topology_physical_package_id(id) : topology_logical_die_id(id);
+               if (uid < 0) {
+                       pr_err("topology_logical_(package/die)_id() returned a negative value");
+-                      return ERR_PTR(-EINVAL);
++                      return NULL;
+               }
+       }
+       else

diff --git a/queue-6.10/series b/queue-6.10/series
index e118e3650331fbe21937289586effe64c15aa931..266ed1435a76595115a95093ee91b6d8c7b22fc4 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -56,3 +56,4 @@ can-mcp251xfd-properly-indent-labels.patch
 can-mcp251xfd-move-mcp251xfd_timestamp_start-stop-into-mcp251xfd_chip_start-stop.patch
 usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch
 usb-usbtmc-prevent-kernel-usb-infoleak.patch
+powercap-intel_rapl-change-an-error-pointer-to-null.patch