summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishka Dasgupta <nishkadg.linux@gmail.com>2019-07-11 23:49:47 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-11 23:56:05 -0700
commitcc95527cceb3d1aaadd5cc1cf601d466af2e53f2 (patch)
tree92877ec29739e0ff5d7ca0abd6b45da96ae8afa3
parent071cfc43c875ee2e6ac2ae6929c2c153e1d13fe7 (diff)
downloadlinux-stable-cc95527cceb3d1aaadd5cc1cf601d466af2e53f2.tar.gz
linux-stable-cc95527cceb3d1aaadd5cc1cf601d466af2e53f2.tar.bz2
linux-stable-cc95527cceb3d1aaadd5cc1cf601d466af2e53f2.zip
Input: mtk-pmic-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. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/mtk-pmic-keys.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
index 8e6ebab05ab4..ebfe119dd398 100644
--- a/drivers/input/keyboard/mtk-pmic-keys.c
+++ b/drivers/input/keyboard/mtk-pmic-keys.c
@@ -286,8 +286,10 @@ static int mtk_pmic_keys_probe(struct platform_device *pdev)
keys->keys[index].regs = &mtk_pmic_regs->keys_regs[index];
keys->keys[index].irq = platform_get_irq(pdev, index);
- if (keys->keys[index].irq < 0)
+ if (keys->keys[index].irq < 0) {
+ of_node_put(child);
return keys->keys[index].irq;
+ }
error = of_property_read_u32(child,
"linux,keycodes", &keys->keys[index].keycode);
@@ -295,6 +297,7 @@ static int mtk_pmic_keys_probe(struct platform_device *pdev)
dev_err(keys->dev,
"failed to read key:%d linux,keycode property: %d\n",
index, error);
+ of_node_put(child);
return error;
}
@@ -302,8 +305,10 @@ static int mtk_pmic_keys_probe(struct platform_device *pdev)
keys->keys[index].wakeup = true;
error = mtk_pmic_key_setup(keys, &keys->keys[index]);
- if (error)
+ if (error) {
+ of_node_put(child);
return error;
+ }
index++;
}