Skip to content

Commit

Permalink
leds: trigger: netdev: validate configured netdev
Browse files Browse the repository at this point in the history
The netdev which the LED should blink for is configurable in
/sys/class/led/foo/device_name. Ensure when offloading that the
configured netdev is the same as the netdev the LED is associated
with. If it is not, only perform software blinking.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andrew Lunn authored and David S. Miller committed May 31, 2023
1 parent 7c145a3 commit 33ec0b5
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions drivers/leds/trigger/ledtrig-netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,24 @@ static bool supports_hw_control(struct led_classdev *led_cdev)
return !strcmp(led_cdev->hw_control_trigger, led_cdev->trigger->name);
}

/*
* Validate the configured netdev is the same as the one associated with
* the LED driver in hw control.
*/
static bool validate_net_dev(struct led_classdev *led_cdev,
struct net_device *net_dev)
{
struct device *dev = led_cdev->hw_control_get_device(led_cdev);
struct net_device *ndev;

if (!dev)
return false;

ndev = to_net_dev(dev);

return ndev == net_dev;
}

static bool can_hw_control(struct led_netdev_data *trigger_data)
{
unsigned long default_interval = msecs_to_jiffies(NETDEV_LED_DEFAULT_INTERVAL);
Expand All @@ -131,9 +149,11 @@ static bool can_hw_control(struct led_netdev_data *trigger_data)
/*
* net_dev must be set with hw control, otherwise no
* blinking can be happening and there is nothing to
* offloaded.
* offloaded. Additionally, for hw control to be
* valid, the configured netdev must be the same as
* netdev associated to the LED.
*/
if (!trigger_data->net_dev)
if (!validate_net_dev(led_cdev, trigger_data->net_dev))
return false;

/* Check if the requested mode is supported */
Expand Down

0 comments on commit 33ec0b5

Please sign in to comment.