drivers/net/dsa/mv88e6xxx/leds.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Fix multiple fwnode reference leaks:
1. The function calls fwnode_get_named_child_node() to get the "leds" node,
but never calls fwnode_handle_put(leds) to release this reference.
2. Within the fwnode_for_each_child_node() loop, the early return
paths that don't properly release the "led" fwnode reference.
This fix follows the same pattern as commit d029edefed39
("net dsa: qca8k: fix usages of device_get_named_child_node()")
Fixes: 94a2a84f5e9e ("net: dsa: mv88e6xxx: Support LED control")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/net/dsa/mv88e6xxx/leds.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c
index 1c88bfaea46b..dcc765066f9c 100644
--- a/drivers/net/dsa/mv88e6xxx/leds.c
+++ b/drivers/net/dsa/mv88e6xxx/leds.c
@@ -779,6 +779,8 @@ int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port)
continue;
if (led_num > 1) {
dev_err(dev, "invalid LED specified port %d\n", port);
+ fwnode_handle_put(led);
+ fwnode_handle_put(leds);
return -EINVAL;
}
@@ -823,17 +825,23 @@ int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port)
init_data.devname_mandatory = true;
init_data.devicename = kasprintf(GFP_KERNEL, "%s:0%d:0%d", chip->info->name,
port, led_num);
- if (!init_data.devicename)
+ if (!init_data.devicename) {
+ fwnode_handle_put(led);
+ fwnode_handle_put(leds);
return -ENOMEM;
+ }
ret = devm_led_classdev_register_ext(dev, l, &init_data);
kfree(init_data.devicename);
if (ret) {
dev_err(dev, "Failed to init LED %d for port %d", led_num, port);
+ fwnode_handle_put(led);
+ fwnode_handle_put(leds);
return ret;
}
}
+ fwnode_handle_put(leds);
return 0;
}
--
2.35.1
> diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c > index 1c88bfaea46b..dcc765066f9c 100644 > --- a/drivers/net/dsa/mv88e6xxx/leds.c > +++ b/drivers/net/dsa/mv88e6xxx/leds.c > @@ -779,6 +779,8 @@ int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port) > continue; > if (led_num > 1) { > dev_err(dev, "invalid LED specified port %d\n", port); > + fwnode_handle_put(led); > + fwnode_handle_put(leds); > return -EINVAL; > } > > @@ -823,17 +825,23 @@ int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port) > init_data.devname_mandatory = true; > init_data.devicename = kasprintf(GFP_KERNEL, "%s:0%d:0%d", chip->info->name, > port, led_num); > - if (!init_data.devicename) > + if (!init_data.devicename) { > + fwnode_handle_put(led); > + fwnode_handle_put(leds); > return -ENOMEM; > + } > > ret = devm_led_classdev_register_ext(dev, l, &init_data); > kfree(init_data.devicename); > > if (ret) { > dev_err(dev, "Failed to init LED %d for port %d", led_num, port); > + fwnode_handle_put(led); > + fwnode_handle_put(leds); > return ret; > } > } > > + fwnode_handle_put(leds); > return 0; Since you need this three times, please put the cleanup at the end and use a goto: Andrew --- pw-bot: cr
© 2016 - 2025 Red Hat, Inc.