net: phy: Remove LED entry from LEDs list on unregister
BugLink: https://bugs.launchpad.net/bugs/2097301 commit f50b5d74c68e551667e265123659b187a30fe3a5 upstream. Commitc938ab4da0("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 <daniel@makrotopia.org> Tested-by: Daniel Golle <daniel@makrotopia.org> Cc: stable@vger.kernel.org Fixes:c938ab4da0("net: phy: Manual remove LEDs to ensure correct ordering") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://patch.msgid.link/20241004182759.14032-1-ansuelsmth@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CVE-2024-50023 Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
747ccac03c
commit
102d9d46c2
@@ -3087,10 +3087,11 @@ static __maybe_unused int phy_led_hw_is_supported(struct led_classdev *led_cdev,
|
||||
|
||||
static void phy_leds_unregister(struct phy_device *phydev)
|
||||
{
|
||||
struct phy_led *phyled;
|
||||
struct phy_led *phyled, *tmp;
|
||||
|
||||
list_for_each_entry(phyled, &phydev->leds, list) {
|
||||
list_for_each_entry_safe(phyled, tmp, &phydev->leds, list) {
|
||||
led_classdev_unregister(&phyled->led_cdev);
|
||||
list_del(&phyled->list);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user