Skip to contentSkip to conversation

memory: of: Fix refcount leak bug in of_get_ddr_timings()

PATCH Applied Liang He 2 participants 3 messages Jul 19, 2022 Memory controller drivers

lore
Share & tools
lore

Liang He

author
#0 lore raw

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

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")

---
changelog:

v2: split two fixes into two patches
v1: https://lore.kernel.org/all/[email protected]/

 drivers/memory/of_memory.c | 1 +
 1 file changed, 1 insertion(+)
drivers/memory/of_memory.c +1 -0
index dbdf87bc0b78..8e2ef4bf6b17 100644
@@ -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;
 			}
Signature · 1 line
2.25.1
author
#1 lore raw

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

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")
---
 drivers/memory/of_memory.c | 1 +
 1 file changed, 1 insertion(+)
drivers/memory/of_memory.c +1 -0
index 8e2ef4bf6b17..fcd20d85d385 100644
@@ -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++;
Signature · 1 line
2.25.1
#2 lore raw
In reply to Liang He
Quoted 5 lines · 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.

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,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>