5.10-stable patches

added patches:
	soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index f7da498aca6473ba404b33f87883009500ceaa89..be4f9be914755307323f609ebf96c002f0e45857 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -233,3 +233,4 @@ alsa-hda-realtek-update-alc256-depop-procedure.patch
 apparmor-fix-do-simple-duplicate-message-elimination.patch
 xen-fix-the-issue-of-resource-not-being-properly-released-in-xenbus_dev_probe.patch
 usb-ehci-spear-fix-call-balance-of-sehci-clk-handling-routines.patch
+soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch

diff --git a/queue-5.10/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch b/queue-5.10/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch
new file mode 100644 (file)
index 0000000..b559257
--- /dev/null
+++ b/queue-5.10/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch
@@ -0,0 +1,42 @@
+From 128fdbf36cddc2a901c4889ba1c89fa9f2643f2c Mon Sep 17 00:00:00 2001
+From: Manikanta Mylavarapu <quic_mmanikan@quicinc.com>
+Date: Wed, 16 Oct 2024 20:18:52 +0530
+Subject: soc: qcom: socinfo: fix revision check in qcom_socinfo_probe()
+
+From: Manikanta Mylavarapu <quic_mmanikan@quicinc.com>
+
+commit 128fdbf36cddc2a901c4889ba1c89fa9f2643f2c upstream.
+
+In success case, the revision holds a non-null pointer. The current
+logic incorrectly returns an error for a non-null pointer, whereas
+it should return an error for a null pointer.
+
+The socinfo driver for IPQ9574 and IPQ5332 is currently broken,
+resulting in the following error message
+qcom-socinfo qcom-socinfo: probe with driver qcom-socinfo failed with
+error -12
+
+Add a null check for the revision to ensure it returns an error only in
+failure case (null pointer).
+
+Fixes: e694d2b5c58b ("soc: qcom: Add check devm_kasprintf() returned value")
+Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@quicinc.com>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20241016144852.2888679-1-quic_mmanikan@quicinc.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/soc/qcom/socinfo.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/soc/qcom/socinfo.c
++++ b/drivers/soc/qcom/socinfo.c
+@@ -507,7 +507,7 @@ static int qcom_socinfo_probe(struct pla
+       qs->attr.revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u.%u",
+                                          SOCINFO_MAJOR(le32_to_cpu(info->ver)),
+                                          SOCINFO_MINOR(le32_to_cpu(info->ver)));
+-      if (!qs->attr.soc_id || qs->attr.revision)
++      if (!qs->attr.soc_id || !qs->attr.revision)
+               return -ENOMEM;
+ 
+       if (offsetof(struct socinfo, serial_num) <= item_size) {