Skip to content

Commit 143ffa7

Browse files
Ansuelgregkh
authored andcommitted
net: phy: Remove LED entry from LEDs list on unregister
commit f50b5d7 upstream. Commit c938ab4 ("net: phy: Manual remove LEDs to ensure correct ordering") correctly fixed a problem with using devm_ but missed removing the LED entry from the LEDs list. This cause kernel panic on specific scenario where the port for the PHY is torn down and up and the kmod for the PHY is removed. On setting the port down the first time, the assosiacted LEDs are correctly unregistered. The associated kmod for the PHY is now removed. The kmod is now added again and the port is now put up, the associated LED are registered again. On putting the port down again for the second time after these step, the LED list now have 4 elements. With the first 2 already unregistered previously and the 2 new one registered again. This cause a kernel panic as the first 2 element should have been removed. Fix this by correctly removing the element when LED is unregistered. Reported-by: Daniel Golle <[email protected]> Tested-by: Daniel Golle <[email protected]> Cc: [email protected] Fixes: c938ab4 ("net: phy: Manual remove LEDs to ensure correct ordering") Signed-off-by: Christian Marangi <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 28a2c3e commit 143ffa7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/phy/phy_device.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3082,10 +3082,11 @@ static __maybe_unused int phy_led_hw_is_supported(struct led_classdev *led_cdev,
30823082

30833083
static void phy_leds_unregister(struct phy_device *phydev)
30843084
{
3085-
struct phy_led *phyled;
3085+
struct phy_led *phyled, *tmp;
30863086

3087-
list_for_each_entry(phyled, &phydev->leds, list) {
3087+
list_for_each_entry_safe(phyled, tmp, &phydev->leds, list) {
30883088
led_classdev_unregister(&phyled->led_cdev);
3089+
list_del(&phyled->list);
30893090
}
30903091
}
30913092

0 commit comments

Comments
 (0)