Skip to contentSkip to conversation

mfd: max77620: Add of_node_put() before return

PATCH Lee Jones 2 participants 2 messages Jul 25, 2019 – Jul 26, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Lee Jones

author
#1 lore raw
Quoted 9 lines · Nishka Dasgupta

Each iteration of for_each_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return. Issue found with Coccinelle.

---
 drivers/mfd/max77620.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Ah, I've just seen that you didn't send this to the list.

When submitting patches upstream, you must CC at least one list.

Usually people CC LKML as a matter of course.

I've CC'ed LMKL here and applied the patch.

Quoted 16 lines
drivers/mfd/max77620.c +3 -1
index 0c28965fcc6a..a851ff473a44 100644
@@ -416,8 +416,10 @@ static int max77620_initialise_fps(struct max77620_chip *chip)
 
 	for_each_child_of_node(fps_np, fps_child) {
 		ret = max77620_config_fps(chip, fps_child);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(fps_child);
 			return ret;
+		}
 	}
 
 	config = chip->enable_global_lpm ? MAX77620_ONOFFCNFG2_SLP_LPM_MSK : 0;
Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw
Quoted 12 lines · Lee Jones
Quoted 9 lines · Nishka Dasgupta

Each iteration of for_each_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return. Issue found with Coccinelle.

---
  drivers/mfd/max77620.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 5 lines

Ah, I've just seen that you didn't send this to the list.

When submitting patches upstream, you must CC at least one list.

Usually people CC LKML as a matter of course.

My mistake, sorry. I'll CC the list from next time.

Thanking you,
Nishka

Quoted 20 lines

I've CC'ed LMKL here and applied the patch.

Quoted 16 lines
drivers/mfd/max77620.c +3 -1
index 0c28965fcc6a..a851ff473a44 100644
@@ -416,8 +416,10 @@ static int max77620_initialise_fps(struct max77620_chip *chip)
 
  	for_each_child_of_node(fps_np, fps_child) {
  		ret = max77620_config_fps(chip, fps_child);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(fps_child);
  			return ret;
+		}
  	}
 
  	config = chip->enable_global_lpm ? MAX77620_ONOFFCNFG2_SLP_LPM_MSK : 0;