| Message ID | 20230424141648.317944-1-alexander.stein@ew.tq-group.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aed8fdad2152d946add50bec00a6b07c457bdcdf |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2,1/1] net: phy: Fix reading LED reg property | expand |
On Mon, Apr 24, 2023 at 04:16:48PM +0200, Alexander Stein wrote: > 'reg' is always encoded in 32 bits, thus it has to be read using the > function with the corresponding bit width. > > Fixes: 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs") > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 4/24/23 07:16, Alexander Stein wrote: > 'reg' is always encoded in 32 bits, thus it has to be read using the > function with the corresponding bit width. > > Fixes: 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs") > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 24 Apr 2023 16:16:48 +0200 you wrote: > 'reg' is always encoded in 32 bits, thus it has to be read using the > function with the corresponding bit width. > > Fixes: 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs") > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > --- > Changes in v2: > * Explicitly do range check before assigning to u8 > > [...] Here is the summary with links: - [net-next,v2,1/1] net: phy: Fix reading LED reg property https://git.kernel.org/netdev/net-next/c/aed8fdad2152 You are awesome, thank you!
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index d373446ab5ac..17d0d0555a79 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -3028,6 +3028,7 @@ static int of_phy_led(struct phy_device *phydev, struct led_init_data init_data = {}; struct led_classdev *cdev; struct phy_led *phyled; + u32 index; int err; phyled = devm_kzalloc(dev, sizeof(*phyled), GFP_KERNEL); @@ -3037,10 +3038,13 @@ static int of_phy_led(struct phy_device *phydev, cdev = &phyled->led_cdev; phyled->phydev = phydev; - err = of_property_read_u8(led, "reg", &phyled->index); + err = of_property_read_u32(led, "reg", &index); if (err) return err; + if (index > U8_MAX) + return -EINVAL; + phyled->index = index; if (phydev->drv->led_brightness_set) cdev->brightness_set_blocking = phy_led_set_brightness; if (phydev->drv->led_blink_set)
'reg' is always encoded in 32 bits, thus it has to be read using the function with the corresponding bit width. Fixes: 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs") Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- Changes in v2: * Explicitly do range check before assigning to u8 drivers/net/phy/phy_device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)