| Message ID | 1485340790-10785-4-git-send-email-geert+renesas@glider.be |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Jan 25, 2017 at 11:39:50AM +0100, Geert Uytterhoeven wrote: > Commit 4567d686f5c6d955 ("phy: increase size of MII_BUS_ID_SIZE and > bus_id") increased the size of MII bus IDs, but forgot to update the > private definition in <linux/phy_led_triggers.h>. > This may cause: > 1. Truncation of LED trigger names, > 2. Duplicate LED trigger names, > 3. Failures registering LED triggers, > 4. Crashes due to bad error handling in the LED trigger failure path. > > To fix this, and prevent the definitions going out of sync again in the > future, let the PHY LED trigger code use the existing MII_BUS_ID_SIZE > definition. > > Example: > - Before I had triggers "ee700000.etherne:01:100Mbps" and > "ee700000.etherne:01:10Mbps", > - After the increase of MII_BUS_ID_SIZE, both became > "ee700000.ethernet-ffffffff:01:" => FAIL, > - Now, the triggers are "ee700000.ethernet-ffffffff:01:100Mbps" and > "ee700000.ethernet-ffffffff:01:10Mbps", which are unique again. > > Fixes: 4567d686f5c6d955 ("phy: increase size of MII_BUS_ID_SIZE and bus_id") > Fixes: 2e0bc452f4721520 ("net: phy: leds: add support for led triggers on phy link state change") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/include/linux/phy_led_triggers.h b/include/linux/phy_led_triggers.h index a2daea0a37d2ae14..b37b05bfd1a6dd8a 100644 --- a/include/linux/phy_led_triggers.h +++ b/include/linux/phy_led_triggers.h @@ -18,11 +18,11 @@ #ifdef CONFIG_LED_TRIGGER_PHY #include <linux/leds.h> +#include <linux/phy.h> #define PHY_LED_TRIGGER_SPEED_SUFFIX_SIZE 10 -#define PHY_MII_BUS_ID_SIZE (20 - 3) -#define PHY_LINK_LED_TRIGGER_NAME_SIZE (PHY_MII_BUS_ID_SIZE + \ +#define PHY_LINK_LED_TRIGGER_NAME_SIZE (MII_BUS_ID_SIZE + \ FIELD_SIZEOF(struct mdio_device, addr)+\ PHY_LED_TRIGGER_SPEED_SUFFIX_SIZE)
Commit 4567d686f5c6d955 ("phy: increase size of MII_BUS_ID_SIZE and bus_id") increased the size of MII bus IDs, but forgot to update the private definition in <linux/phy_led_triggers.h>. This may cause: 1. Truncation of LED trigger names, 2. Duplicate LED trigger names, 3. Failures registering LED triggers, 4. Crashes due to bad error handling in the LED trigger failure path. To fix this, and prevent the definitions going out of sync again in the future, let the PHY LED trigger code use the existing MII_BUS_ID_SIZE definition. Example: - Before I had triggers "ee700000.etherne:01:100Mbps" and "ee700000.etherne:01:10Mbps", - After the increase of MII_BUS_ID_SIZE, both became "ee700000.ethernet-ffffffff:01:" => FAIL, - Now, the triggers are "ee700000.ethernet-ffffffff:01:100Mbps" and "ee700000.ethernet-ffffffff:01:10Mbps", which are unique again. Fixes: 4567d686f5c6d955 ("phy: increase size of MII_BUS_ID_SIZE and bus_id") Fixes: 2e0bc452f4721520 ("net: phy: leds: add support for led triggers on phy link state change") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Drop moving the include of <linux/phy_led_triggers.h>, as <linux/phy.h> no longer includes it, - #include <linux/phy.h> from <linux/phy_led_triggers.h>. --- include/linux/phy_led_triggers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)