2023-05-15 08:49:38

by Lu Hongfei

Subject: [PATCH] led: qcom-lpg: Fix bugs in lpg_add_led & lpg_probe

for_each_available_child_of_node in lpg_probe and lpg_add_led need
to execute of_node_put before return. this patch could fix this bug.

Signed-off-by: luhongfei <[email protected]>
---
drivers/leds/rgb/leds-qcom-lpg.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
mode change 100644 => 100755 drivers/leds/rgb/leds-qcom-lpg.c

diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c
index 55a037234df1..0e8ff36c4bf7
--- a/drivers/leds/rgb/leds-qcom-lpg.c
+++ b/drivers/leds/rgb/leds-qcom-lpg.c
@@ -1173,8 +1173,10 @@ static int lpg_add_led(struct lpg *lpg, struct device_node *np)
i = 0;
for_each_available_child_of_node(np, child) {
ret = lpg_parse_channel(lpg, child, &led->channels[i]);
- if (ret < 0)
+ if (ret < 0) {
+ of_node_put(child);
return ret;
+ }

info[i].color_index = led->channels[i]->color;
info[i].intensity = 0;
@@ -1352,8 +1354,10 @@ static int lpg_probe(struct platform_device *pdev)

for_each_available_child_of_node(pdev->dev.of_node, np) {
ret = lpg_add_led(lpg, np);
- if (ret)
+ if (ret) {
+ of_node_put(np);
return ret;
+ }
}

for (i = 0; i < lpg->num_channels; i++)
--
2.39.0

2023-05-25 10:40:10

by Lee Jones

Subject: Re: [PATCH] led: qcom-lpg: Fix bugs in lpg_add_led & lpg_probe

Please improve the subject line. Maybe:

"Fix resource leaks in for_each_available_child_of_node() loops"

On Mon, 15 May 2023, luhongfei wrote:

> for_each_available_child_of_node in lpg_probe and lpg_add_led need
> to execute of_node_put before return. this patch could fix this bug.

"Ensure child node references are decremented properly in the error path."

> Signed-off-by: luhongfei <[email protected]>

Please use your full name.

> ---
> drivers/leds/rgb/leds-qcom-lpg.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> mode change 100644 => 100755 drivers/leds/rgb/leds-qcom-lpg.c
>
> diff --git a/drivers/leds/rgb/leds-qcom-lpg.c b/drivers/leds/rgb/leds-qcom-lpg.c
> index 55a037234df1..0e8ff36c4bf7
> --- a/drivers/leds/rgb/leds-qcom-lpg.c
> +++ b/drivers/leds/rgb/leds-qcom-lpg.c
> @@ -1173,8 +1173,10 @@ static int lpg_add_led(struct lpg *lpg, struct device_node *np)
> i = 0;
> for_each_available_child_of_node(np, child) {
> ret = lpg_parse_channel(lpg, child, &led->channels[i]);
> - if (ret < 0)
> + if (ret < 0) {
> + of_node_put(child);
> return ret;
> + }
>
> info[i].color_index = led->channels[i]->color;
> info[i].intensity = 0;
> @@ -1352,8 +1354,10 @@ static int lpg_probe(struct platform_device *pdev)
>
> for_each_available_child_of_node(pdev->dev.of_node, np) {
> ret = lpg_add_led(lpg, np);
> - if (ret)
> + if (ret) {
> + of_node_put(np);
> return ret;
> + }
> }

Code is fine.

--
Lee Jones [李琼斯]