2022-05-26 18:36:30

by Miaoqian Lin

Subject: [PATCH] net: dsa: mv88e6xxx: Fix refcount leak in mv88e6xxx_mdios_register

of_get_child_by_name() returns a node pointer with refcount
incremented, we should use of_node_put() on it when done.
This function missing of_node_put() in an error path.
Add missing of_node_put() to avoid refcount leak.

Signed-off-by: Miaoqian Lin <[email protected]>
---
drivers/net/dsa/mv88e6xxx/chip.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 5d2c57a7c708..0726df6aeb1f 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3960,8 +3960,10 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
*/
child = of_get_child_by_name(np, "mdio");
err = mv88e6xxx_mdio_register(chip, child, false);
- if (err)
+ if (err) {
+ of_node_put(child);
return err;
+ }

/* Walk the device tree, and see if there are any other nodes
* which say they are compatible with the external mdio
--
2.25.1

2022-05-28 19:32:19

by Marek Behún

Subject: Re: [PATCH] net: dsa: mv88e6xxx: Fix refcount leak in mv88e6xxx_mdios_register

On Thu, 26 May 2022 12:37:48 +0400
Miaoqian Lin <[email protected]> wrote:

> of_get_child_by_name() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when done.
> This function missing of_node_put() in an error path.
> Add missing of_node_put() to avoid refcount leak.
>
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> drivers/net/dsa/mv88e6xxx/chip.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
> index 5d2c57a7c708..0726df6aeb1f 100644
> --- a/drivers/net/dsa/mv88e6xxx/chip.c
> +++ b/drivers/net/dsa/mv88e6xxx/chip.c
> @@ -3960,8 +3960,10 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
> */
> child = of_get_child_by_name(np, "mdio");
> err = mv88e6xxx_mdio_register(chip, child, false);
> - if (err)
> + if (err) {
> + of_node_put(child);
> return err;
> + }
>
> /* Walk the device tree, and see if there are any other nodes
> * which say they are compatible with the external mdio

Fix needs Fixes tag so that it can be backported. Please add correct
Fixes tag.