Skip to contentSkip to conversation

input: keyboard: sun4i-lradc-keys: Add of_node_put() before return

PATCH Applied Nishka Dasgupta 2 participants 2 messages Jul 9, 2019 – Jul 12, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: keyboard: sun4i-lradc-keys: Add of_node_put() before return

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 in three places.
Issue found with Coccinelle.

---
 drivers/input/keyboard/sun4i-lradc-keys.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/input/keyboard/sun4i-lradc-keys.c +3 -0
index 6ffdc26b9c89..4a796bed48ac 100644
@@ -198,18 +198,21 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev,
 		error = of_property_read_u32(pp, "channel", &channel);
 		if (error || channel != 0) {
 			dev_err(dev, "%pOFn: Inval channel prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
 		error = of_property_read_u32(pp, "voltage", &map->voltage);
 		if (error) {
 			dev_err(dev, "%pOFn: Inval voltage prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
 		error = of_property_read_u32(pp, "linux,code", &map->keycode);
 		if (error) {
 			dev_err(dev, "%pOFn: Inval linux,code prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
Signature · 1 line
2.19.1
maintainer Applied
#1 lore raw
Quoted 7 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 in three places.
Issue found with Coccinelle.

Applied, thank you.

Quoted 33 lines
---
 drivers/input/keyboard/sun4i-lradc-keys.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/input/keyboard/sun4i-lradc-keys.c +3 -0
index 6ffdc26b9c89..4a796bed48ac 100644
@@ -198,18 +198,21 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev,
 		error = of_property_read_u32(pp, "channel", &channel);
 		if (error || channel != 0) {
 			dev_err(dev, "%pOFn: Inval channel prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
 		error = of_property_read_u32(pp, "voltage", &map->voltage);
 		if (error) {
 			dev_err(dev, "%pOFn: Inval voltage prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
 		error = of_property_read_u32(pp, "linux,code", &map->keycode);
 		if (error) {
 			dev_err(dev, "%pOFn: Inval linux,code prop\n", pp);
+			of_node_put(pp);
 			return -EINVAL;
 		}
 
Signature · 1 line
2.19.1
Signature · 1 line
Dmitry