This is a note to let you know that I've just added the patch titled
interconnect: exynos: fix node leak in probe PM QoS error path
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:
interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.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 3aab264875bf3c915ea2517fae1eec213e0b4987 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon, 6 Mar 2023 08:56:42 +0100
Subject: interconnect: exynos: fix node leak in probe PM QoS error path
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 3aab264875bf3c915ea2517fae1eec213e0b4987 upstream.
Make sure to add the newly allocated interconnect node to the provider
before adding the PM QoS request so that the node is freed on errors.
Fixes: 2f95b9d5cf0b ("interconnect: Add generic interconnect driver for Exynos SoCs")
Cc: stable@xxxxxxxxxxxxxxx # 5.11
Cc: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230306075651.2449-15-johan+linaro@xxxxxxxxxx
Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/interconnect/samsung/exynos.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/interconnect/samsung/exynos.c
+++ b/drivers/interconnect/samsung/exynos.c
@@ -149,6 +149,9 @@ static int exynos_generic_icc_probe(stru
&priv->bus_clk_ratio))
priv->bus_clk_ratio = EXYNOS_ICC_DEFAULT_BUS_CLK_RATIO;
+ icc_node->data = priv;
+ icc_node_add(icc_node, provider);
+
/*
* Register a PM QoS request for the parent (devfreq) device.
*/
@@ -157,9 +160,6 @@ static int exynos_generic_icc_probe(stru
if (ret < 0)
goto err_node_del;
- icc_node->data = priv;
- icc_node_add(icc_node, provider);
-
icc_parent_node = exynos_icc_get_parent(bus_dev->of_node);
if (IS_ERR(icc_parent_node)) {
ret = PTR_ERR(icc_parent_node);
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.1/memory-tegra20-emc-fix-interconnect-registration-race.patch
queue-6.1/memory-tegra124-emc-fix-interconnect-registration-race.patch
queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch
queue-6.1/interconnect-exynos-fix-registration-race.patch
queue-6.1/interconnect-imx-fix-registration-race.patch
queue-6.1/memory-tegra30-emc-fix-interconnect-registration-race.patch
queue-6.1/interconnect-qcom-msm8974-fix-registration-race.patch
queue-6.1/memory-tegra-fix-interconnect-registration-race.patch
queue-6.1/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch
queue-6.1/interconnect-qcom-rpm-fix-registration-race.patch
queue-6.1/interconnect-fix-provider-registration-api.patch
queue-6.1/interconnect-fix-icc_provider_del-error-handling.patch
queue-6.1/interconnect-qcom-rpmh-fix-registration-race.patch
queue-6.1/interconnect-fix-mem-leak-when-freeing-nodes.patch
queue-6.1/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch
queue-6.1/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch
queue-6.1/interconnect-qcom-osm-l3-fix-registration-race.patch
