From 3774a173039be2d71ed1a89add19f4cdada74c34 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 2 Dec 2024 14:55:32 +0100 Subject: [PATCH] 6.1-stable patches added patches: asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch --- ...of-uninitialized-ctx-to-log-an-error.patch | 34 +++++++++++++++ queue-6.1/series | 2 + ...revision-check-in-qcom_socinfo_probe.patch | 42 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 queue-6.1/asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch create mode 100644 queue-6.1/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch diff --git a/queue-6.1/asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch b/queue-6.1/asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch new file mode 100644 index 00000000000..4b0d883c5bf --- /dev/null +++ b/queue-6.1/asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch @@ -0,0 +1,34 @@ +From c1895ba181e560144601fafe46aeedbafdf4dbc4 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 26 Oct 2024 16:36:15 +0200 +Subject: ASoC: Intel: sst: Fix used of uninitialized ctx to log an error + +From: Hans de Goede + +commit c1895ba181e560144601fafe46aeedbafdf4dbc4 upstream. + +Fix the new "LPE0F28" code path using the uninitialized ctx variable +to log an error. + +Fixes: 6668610b4d8c ("ASoC: Intel: sst: Support LPE0F28 ACPI HID") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202410261106.EBx49ssy-lkp@intel.com/ +Signed-off-by: Hans de Goede +Link: https://patch.msgid.link/20241026143615.171821-1-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/intel/atom/sst/sst_acpi.c ++++ b/sound/soc/intel/atom/sst/sst_acpi.c +@@ -309,7 +309,7 @@ static int sst_acpi_probe(struct platfor + rsrc = platform_get_resource(pdev, IORESOURCE_MEM, + pdata->res_info->acpi_lpe_res_index); + if (!rsrc) { +- dev_err(ctx->dev, "Invalid SHIM base\n"); ++ dev_err(dev, "Invalid SHIM base\n"); + return -EIO; + } + rsrc->start -= pdata->res_info->shim_offset; diff --git a/queue-6.1/series b/queue-6.1/series index bb8d8de698c..61522b2b03c 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -366,3 +366,5 @@ revert-arm64-dts-mediatek-mt8195-cherry-mark-usb-3.0-on-xhci1-as-disabled.patch arm64-dts-mediatek-mt8195-cherry-mark-usb-3.0-on-xhci1-as-disabled.patch mm-slab-decouple-arch_kmalloc_minalign-from-arch_dma_minalign.patch dma-allow-dma_get_cache_alignment-to-be-overridden-by-the-arch-code.patch +asoc-intel-sst-fix-used-of-uninitialized-ctx-to-log-an-error.patch +soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch diff --git a/queue-6.1/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch b/queue-6.1/soc-qcom-socinfo-fix-revision-check-in-qcom_socinfo_probe.patch new file mode 100644 index 00000000000..f8e12acf360 --- /dev/null +++ b/queue-6.1/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 +Date: Wed, 16 Oct 2024 20:18:52 +0530 +Subject: soc: qcom: socinfo: fix revision check in qcom_socinfo_probe() + +From: Manikanta Mylavarapu + +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 +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20241016144852.2888679-1-quic_mmanikan@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -649,7 +649,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) { -- 2.47.3