[PATCH] bus: qcom: Put child node before return

[PATCH] bus: qcom: Put child node before return

[Pan Bian]

Put child node before return to fix potential reference count leak.
Generally, the reference count of child is incremented and decremented
automatically in the macro for_each_available_child_of_node() and should
be decremented manually if the loop is broken in loop body.

Fixes: 335a12754808 ("bus: qcom: add EBI2 driver")
Signed-off-by: Pan Bian <bianpan2016@163.com>
---
 drivers/bus/qcom-ebi2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/qcom-ebi2.c b/drivers/bus/qcom-ebi2.c
index 03ddcf426887..0b8f53a688b8 100644
--- a/drivers/bus/qcom-ebi2.c
+++ b/drivers/bus/qcom-ebi2.c
@@ -353,8 +353,10 @@ static int qcom_ebi2_probe(struct platform_device *pdev)
 
 		/* Figure out the chipselect */
 		ret = of_property_read_u32(child, "reg", &csindex);
-		if (ret)
+		if (ret) {
+			of_node_put(child);
 			return ret;
+		}
 
 		if (csindex > 5) {
 			dev_err(dev,
-- 
2.17.1

Re: [PATCH] bus: qcom: Put child node before return

[Linus Walleij]

On Thu, Jan 21, 2021 at 12:49 PM Pan Bian <bianpan2016@163.com> wrote:

> Put child node before return to fix potential reference count leak.
> Generally, the reference count of child is incremented and decremented
> automatically in the macro for_each_available_child_of_node() and should
> be decremented manually if the loop is broken in loop body.
>
> Fixes: 335a12754808 ("bus: qcom: add EBI2 driver")
> Signed-off-by: Pan Bian <bianpan2016@163.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Please submit this patch for inclusion through the ARM SoC tree.

Yours,
Linus Walleij

Re: [PATCH] bus: qcom: Put child node before return

[Bjorn Andersson]

On Fri 22 Jan 16:47 CST 2021, Linus Walleij wrote:

> On Thu, Jan 21, 2021 at 12:49 PM Pan Bian <bianpan2016@163.com> wrote:
> 
> > Put child node before return to fix potential reference count leak.
> > Generally, the reference count of child is incremented and decremented
> > automatically in the macro for_each_available_child_of_node() and should
> > be decremented manually if the loop is broken in loop body.
> >
> > Fixes: 335a12754808 ("bus: qcom: add EBI2 driver")
> > Signed-off-by: Pan Bian <bianpan2016@163.com>
> 
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Please submit this patch for inclusion through the ARM SoC tree.
> 

Any objections to me picking it in the Qualcomm tree? Or that's what you
indirectly meant?

Regards,
Bjorn

Re: [PATCH] bus: qcom: Put child node before return

[Linus Walleij]

On Sat, Jan 23, 2021 at 12:19 AM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
> On Fri 22 Jan 16:47 CST 2021, Linus Walleij wrote:
>
> > On Thu, Jan 21, 2021 at 12:49 PM Pan Bian <bianpan2016@163.com> wrote:
> >
> > > Put child node before return to fix potential reference count leak.
> > > Generally, the reference count of child is incremented and decremented
> > > automatically in the macro for_each_available_child_of_node() and should
> > > be decremented manually if the loop is broken in loop body.
> > >
> > > Fixes: 335a12754808 ("bus: qcom: add EBI2 driver")
> > > Signed-off-by: Pan Bian <bianpan2016@163.com>
> >
> > Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > Please submit this patch for inclusion through the ARM SoC tree.
> >
>
> Any objections to me picking it in the Qualcomm tree? Or that's what you
> indirectly meant?

Kind-of-sort-of :D

Apply it to the Qualcomm tree!

Yours,
Linus Walleij