FAILED: patch "[PATCH] pmdomain: imx: Fix reference count leak in imx_gpc_probe()" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 73cb5f6eafb0ac7aea8cdeb8ff12981aa741d8fb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026010514-cahoots-scholar-954d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 73cb5f6eafb0ac7aea8cdeb8ff12981aa741d8fb Mon Sep 17 00:00:00 2001
From: Wentao Liang <[email protected]>
Date: Thu, 11 Dec 2025 04:02:52 +0000
Subject: [PATCH] pmdomain: imx: Fix reference count leak in imx_gpc_probe()
of_get_child_by_name() returns a node pointer with refcount incremented. Use the __free() attribute to manage the pgc_node reference, ensuring automatic of_node_put() cleanup when pgc_node goes out of scope.
This eliminates the need for explicit error handling paths and avoids reference count leaks.
drivers/pmdomain/imx/gpc.c +2 -3
@@ -402,13 +402,12 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap,static int imx_gpc_probe (struct platform_device *pdev) {const struct imx_gpc_dt_data *of_id_data =device_get_match_data (&pdev->dev); -struct device_node *pgc_node; + struct device_node *pgc_node __free(device_node) + =of_get_child_by_name (pdev->dev.of_node,"pgc" );struct regmap *regmap;void __iomem *base;int ret; - pgc_node =of_get_child_by_name (pdev->dev.of_node,"pgc" ); -/* bail out if DT too old and doesn't provide the necessary info */ if (!of_property_present (pdev->dev.of_node,"#power-domain-cells" ) && !pgc_node)
Sasha Levin
maintainerPATCH 1/2 pmdomain: Use device_get_match_data()
From: Rob Herring <[email protected]>
[ Upstream commit 3ba9fdfaa550936837b50b73d6c27ac401fde875 ]
Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.
Stable-dep-of: 73cb5f6eafb0 ("pmdomain: imx: Fix reference count leak in imx_gpc_probe()")
--- drivers/soc/actions/owl-sps.c | 16 +++++----------- drivers/soc/imx/gpc.c | 7 +++---- drivers/soc/rockchip/pm_domains.c | 13 ++++--------- 3 files changed, 12 insertions(+), 24 deletions(-)
drivers/soc/actions/owl-sps.c +5 -11
@@ -8,8 +8,10 @@* Copyright (c) 2017 Andreas Färber */ +#include <linux/mod_devicetable.h> #include <linux/of_address.h> -#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/property.h> #include <linux/pm_domain.h> #include <linux/soc/actions/owl-sps.h> #include <dt-bindings/power/owl-s500-powergate.h>
@@ -96,24 +98,16 @@ static int owl_sps_init_domain(struct owl_sps *sps, int index)static int owl_sps_probe (struct platform_device *pdev) { -const struct of_device_id *match;const struct owl_sps_info *sps_info;struct owl_sps *sps;int i, ret; -if (!pdev->dev.of_node) { -dev_err (&pdev->dev,"no device node\n" ); -return -ENODEV ; - } - - match =of_match_device (pdev->dev.driver->of_match_table, &pdev->dev); -if (!match || !match->data) { + sps_info =device_get_match_data (&pdev->dev); +if (!sps_info) {dev_err (&pdev->dev,"unknown compatible or missing data\n" );return -EINVAL ; } - sps_info = match->data; - sps =devm_kzalloc (&pdev->dev,struct_size (sps, domains, sps_info->num_domains),GFP_KERNEL );
drivers/soc/imx/gpc.c +3 -4
@@ -7,9 +7,10 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/io.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -403,9 +404,7 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap,static int imx_gpc_probe (struct platform_device *pdev) { -const struct of_device_id *of_id = -of_match_device (imx_gpc_dt_ids, &pdev->dev); -const struct imx_gpc_dt_data *of_id_data = of_id->data; +const struct imx_gpc_dt_data *of_id_data =device_get_match_data (&pdev->dev);struct device_node *pgc_node;struct regmap *regmap;void __iomem *base;
drivers/soc/rockchip/pm_domains.c +4 -9
@@ -9,11 +9,13 @@#include <linux/iopoll.h> #include <linux/err.h> #include <linux/mutex.h> +#include <linux/platform_device.h> #include <linux/pm_clock.h> #include <linux/pm_domain.h> +#include <linux/property.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_clk.h> -#include <linux/of_platform.h> #include <linux/clk.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h>
@@ -770,7 +772,6 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)struct device_node *node;struct device *parent;struct rockchip_pmu *pmu; -const struct of_device_id *match;const struct rockchip_pmu_info *pmu_info;int error;
@@ -779,13 +780,7 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)return -ENODEV ; } - match =of_match_device (dev->driver->of_match_table, dev); -if (!match || !match->data) { -dev_err (dev,"missing pmu data\n" ); -return -EINVAL ; - } - - pmu_info = match->data; + pmu_info =device_get_match_data (dev); pmu = devm_kzalloc(dev, struct_size(pmu, domains, pmu_info->num_domains),
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 pmdomain: imx: Fix reference count leak in imx_gpc_probe()
From: Wentao Liang <[email protected]>
[ Upstream commit 73cb5f6eafb0ac7aea8cdeb8ff12981aa741d8fb ]
of_get_child_by_name() returns a node pointer with refcount incremented. Use the __free() attribute to manage the pgc_node reference, ensuring automatic of_node_put() cleanup when pgc_node goes out of scope.
This eliminates the need for explicit error handling paths and avoids reference count leaks.
--- drivers/soc/imx/gpc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/soc/imx/gpc.c +2 -3
@@ -405,13 +405,12 @@ static int imx_gpc_old_dt_init(struct device *dev, struct regmap *regmap,static int imx_gpc_probe (struct platform_device *pdev) {const struct imx_gpc_dt_data *of_id_data =device_get_match_data (&pdev->dev); -struct device_node *pgc_node; + struct device_node *pgc_node __free(device_node) + =of_get_child_by_name (pdev->dev.of_node,"pgc" );struct regmap *regmap;void __iomem *base;int ret; - pgc_node =of_get_child_by_name (pdev->dev.of_node,"pgc" ); -/* bail out if DT too old and doesn't provide the necessary info */ if (!of_property_read_bool (pdev->dev.of_node,"#power-domain-cells" ) && !pgc_node)
Signature · 1 line
2.51.0