diff options
| author | Martin Schiller <ms@dev.tdt.de> | 2019-10-25 09:22:29 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2019-11-07 00:10:18 +0100 |
| commit | edbadec843a77286d4f690a3641b7bca97f4c998 (patch) | |
| tree | 9f3e095b22ff5f0c5629dbf5f6aa8c6c86dfae9f /target/linux/generic | |
| parent | 3540a37a973671b83a262d576464698c0d042e83 (diff) | |
| download | upstream-edbadec843a77286d4f690a3641b7bca97f4c998.tar.gz upstream-edbadec843a77286d4f690a3641b7bca97f4c998.tar.bz2 upstream-edbadec843a77286d4f690a3641b7bca97f4c998.zip | |
kernel: fix LED netdev trigger on interface rename
This fixes the netdev LED trigger for interfaces, which are renamed
during initialization (e.g. ppp interfaces).
Fixes: FS#2193
Fixes: FS#2239
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Diffstat (limited to 'target/linux/generic')
2 files changed, 108 insertions, 0 deletions
diff --git a/target/linux/generic/backport-4.14/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch b/target/linux/generic/backport-4.14/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch new file mode 100644 index 0000000000..baae3b7cb4 --- /dev/null +++ b/target/linux/generic/backport-4.14/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch @@ -0,0 +1,54 @@ +From 0ff035231edca3713c3d0839c44e64a4ac41ef38 Mon Sep 17 00:00:00 2001 +From: Martin Schiller <ms@dev.tdt.de> +Date: Thu, 24 Oct 2019 15:09:23 +0200 +Subject: [PATCH] leds: trigger: netdev: fix handling on interface rename + +The NETDEV_CHANGENAME code is not "unneeded" like it is stated in commit +4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface +rename"). + +The event was accidentally misinterpreted equivalent to +NETDEV_UNREGISTER, but should be equivalent to NETDEV_REGISTER. + +This was the case in the original code from the openwrt project. + +Otherwise, you are unable to set netdev led triggers for (non-existent) +netdevices, which has to be renamed. This is the case, for example, for +ppp interfaces in openwrt. + +Fixes: 06f502f57d0d ("leds: trigger: Introduce a NETDEV trigger") +Fixes: 4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface rename") +Signed-off-by: Martin Schiller <ms@dev.tdt.de> +--- + drivers/leds/trigger/ledtrig-netdev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c +index 136f86a1627d..d5e774d83021 100644 +--- a/drivers/leds/trigger/ledtrig-netdev.c ++++ b/drivers/leds/trigger/ledtrig-netdev.c +@@ -302,10 +302,12 @@ static int netdev_trig_notify(struct notifier_block *nb, + container_of(nb, struct led_netdev_data, notifier); + + if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE +- && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) ++ && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER ++ && evt != NETDEV_CHANGENAME) + return NOTIFY_DONE; + + if (!(dev == trigger_data->net_dev || ++ (evt == NETDEV_CHANGENAME && !strcmp(dev->name, trigger_data->device_name)) || + (evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name)))) + return NOTIFY_DONE; + +@@ -315,6 +317,7 @@ static int netdev_trig_notify(struct notifier_block *nb, + + clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); + switch (evt) { ++ case NETDEV_CHANGENAME: + case NETDEV_REGISTER: + if (trigger_data->net_dev) + dev_put(trigger_data->net_dev); +-- +2.20.1 + diff --git a/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch b/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch new file mode 100644 index 0000000000..baae3b7cb4 --- /dev/null +++ b/target/linux/generic/backport-4.19/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch @@ -0,0 +1,54 @@ +From 0ff035231edca3713c3d0839c44e64a4ac41ef38 Mon Sep 17 00:00:00 2001 +From: Martin Schiller <ms@dev.tdt.de> +Date: Thu, 24 Oct 2019 15:09:23 +0200 +Subject: [PATCH] leds: trigger: netdev: fix handling on interface rename + +The NETDEV_CHANGENAME code is not "unneeded" like it is stated in commit +4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface +rename"). + +The event was accidentally misinterpreted equivalent to +NETDEV_UNREGISTER, but should be equivalent to NETDEV_REGISTER. + +This was the case in the original code from the openwrt project. + +Otherwise, you are unable to set netdev led triggers for (non-existent) +netdevices, which has to be renamed. This is the case, for example, for +ppp interfaces in openwrt. + +Fixes: 06f502f57d0d ("leds: trigger: Introduce a NETDEV trigger") +Fixes: 4cb6560514fa ("leds: trigger: netdev: fix refcnt leak on interface rename") +Signed-off-by: Martin Schiller <ms@dev.tdt.de> +--- + drivers/leds/trigger/ledtrig-netdev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c +index 136f86a1627d..d5e774d83021 100644 +--- a/drivers/leds/trigger/ledtrig-netdev.c ++++ b/drivers/leds/trigger/ledtrig-netdev.c +@@ -302,10 +302,12 @@ static int netdev_trig_notify(struct notifier_block *nb, + container_of(nb, struct led_netdev_data, notifier); + + if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE +- && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) ++ && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER ++ && evt != NETDEV_CHANGENAME) + return NOTIFY_DONE; + + if (!(dev == trigger_data->net_dev || ++ (evt == NETDEV_CHANGENAME && !strcmp(dev->name, trigger_data->device_name)) || + (evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name)))) + return NOTIFY_DONE; + +@@ -315,6 +317,7 @@ static int netdev_trig_notify(struct notifier_block *nb, + + clear_bit(NETDEV_LED_MODE_LINKUP, &trigger_data->mode); + switch (evt) { ++ case NETDEV_CHANGENAME: + case NETDEV_REGISTER: + if (trigger_data->net_dev) + dev_put(trigger_data->net_dev); +-- +2.20.1 + |