[PATCH v2 1/2] memory: of: Fix refcount leak bug in of_get_ddr_timings()

[PATCH v2 1/2] memory: of: Fix refcount leak bug in of_get_ddr_timings()

[Liang He]

We should add the of_node_put() when breaking out of
for_each_child_of_node() as it will automatically increase
and decrease the refcount.

Fixes: e6b42eb6a66c ("memory: emif: add device tree support to emif driver")
Signed-off-by: Liang He <windhl@126.com>
---
 changelog:

 v2: split two fixes into two patches
 v1: https://lore.kernel.org/all/20220716025043.447036-1-windhl@126.com/

 drivers/memory/of_memory.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c
index dbdf87bc0b78..8e2ef4bf6b17 100644
--- a/drivers/memory/of_memory.c
+++ b/drivers/memory/of_memory.c
@@ -134,6 +134,7 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr,
 	for_each_child_of_node(np_ddr, np_tim) {
 		if (of_device_is_compatible(np_tim, tim_compat)) {
 			if (of_do_get_timings(np_tim, &timings[i])) {
+				of_node_put(np_tim);
 				devm_kfree(dev, timings);
 				goto default_timings;
 			}
-- 
2.25.1

[PATCH v2 2/2] memory: of: Fix refcount leak bug in of_lpddr3_get_ddr_timings()

[Liang He]

We should add the of_node_put() when breaking out of
for_each_child_of_node() as it will automatically increase
and decrease the refcount.

Fixes: 976897dd96db ("memory: Extend of_memory with LPDDR3 support")
Signed-off-by: Liang He <windhl@126.com>
---
 drivers/memory/of_memory.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c
index 8e2ef4bf6b17..fcd20d85d385 100644
--- a/drivers/memory/of_memory.c
+++ b/drivers/memory/of_memory.c
@@ -285,6 +285,7 @@ const struct lpddr3_timings
 		if (of_device_is_compatible(np_tim, tim_compat)) {
 			if (of_lpddr3_do_get_timings(np_tim, &timings[i])) {
 				devm_kfree(dev, timings);
+				of_node_put(np_tim);
 				goto default_timings;
 			}
 			i++;
-- 
2.25.1

Re: [PATCH v2 1/2] memory: of: Fix refcount leak bug in of_get_ddr_timings()

[Krzysztof Kozlowski]

On Tue, 19 Jul 2022 16:56:39 +0800, Liang He wrote:
> We should add the of_node_put() when breaking out of
> for_each_child_of_node() as it will automatically increase
> and decrease the refcount.
> 
> 

Applied, thanks!

[1/2] memory: of: Fix refcount leak bug in of_get_ddr_timings()
      https://git.kernel.org/krzk/linux-mem-ctrl/c/b54af20531018c2bb7181ba2f511327b3c9f1cef
[2/2] memory: of: Fix refcount leak bug in of_lpddr3_get_ddr_timings()
      https://git.kernel.org/krzk/linux-mem-ctrl/c/2f1b3550a152baa8287ee95586f0385410a5296b

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>