net: usb: Check for Wake-on-LAN modes
Subsystems (7)
v2 cover net: usb: Check for Wake-on-LAN modes
Hi all,
Most of our USB Ethernet drivers don't seem to be checking properly whether the user is supplying a correct Wake-on-LAN mode to enter, so the experience as an user could be confusing, since it would generally lead to either no wake-up, or the device not being marked for wake-up.
Please review!
Changes in v2:
- fixed lan78xx handling, thanks Woojung!
Florian Fainelli (7):
asix: Check for supported Wake-on-LAN modes
ax88179_178a: Check for supported Wake-on-LAN modes
lan78xx: Check for supported Wake-on-LAN modes
sr9800: Check for supported Wake-on-LAN modes
r8152: Check for supported Wake-on-LAN Modes
smsc75xx: Check for Wake-on-LAN modes
smsc95xx: Check for Wake-on-LAN modes
drivers/net/usb/asix_common.c | 3 +++ drivers/net/usb/ax88179_178a.c | 3 +++ drivers/net/usb/lan78xx.c | 17 ++++------------- drivers/net/usb/r8152.c | 3 +++ drivers/net/usb/smsc75xx.c | 3 +++ drivers/net/usb/smsc95xx.c | 3 +++ drivers/net/usb/sr9800.c | 3 +++ 7 files changed, 22 insertions(+), 13 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/7 asix: Check for supported Wake-on-LAN modes
The driver currently silently accepts unsupported Wake-on-LAN modes (other than WAKE_PHY or WAKE_MAGIC) without reporting that to the user, which is confusing.
--- drivers/net/usb/asix_common.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/asix_common.c +3 -0
@@ -607,6 +607,9 @@ int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)struct usbnet *dev =netdev_priv (net);u8 opt =0 ; +if (wolinfo->wolopts & ~(WAKE_PHY |WAKE_MAGIC )) +return -EINVAL ; +if (wolinfo->wolopts &WAKE_PHY ) opt |=AX_MONITOR_LINK ;if (wolinfo->wolopts &WAKE_MAGIC )
PATCH v2 2/7 ax88179_178a: Check for supported Wake-on-LAN modes
In reply to Florian FainelliThe driver currently silently accepts unsupported Wake-on-LAN modes (other than WAKE_PHY or WAKE_MAGIC) without reporting that to the user, which is confusing.
--- drivers/net/usb/ax88179_178a.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/ax88179_178a.c +3 -0
@@ -566,6 +566,9 @@ ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)struct usbnet *dev =netdev_priv (net);u8 opt =0 ; +if (wolinfo->wolopts & ~(WAKE_PHY |WAKE_MAGIC )) +return -EINVAL ; +if (wolinfo->wolopts &WAKE_PHY ) opt |=AX_MONITOR_MODE_RWLC ;if (wolinfo->wolopts &WAKE_MAGIC )
PATCH v2 3/7 lan78xx: Check for supported Wake-on-LAN modes
In reply to Florian FainelliThe driver supports a fair amount of Wake-on-LAN modes, but is not checking that the user specified one that is supported.
--- drivers/net/usb/lan78xx.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/net/usb/lan78xx.c +4 -13
@@ -1401,19 +1401,10 @@ static int lan78xx_set_wol(struct net_device *netdev,if (ret <0 )return ret; - pdata->wol =0 ; -if (wol->wolopts &WAKE_UCAST ) - pdata->wol |=WAKE_UCAST ; -if (wol->wolopts &WAKE_MCAST ) - pdata->wol |=WAKE_MCAST ; -if (wol->wolopts &WAKE_BCAST ) - pdata->wol |=WAKE_BCAST ; -if (wol->wolopts &WAKE_MAGIC ) - pdata->wol |=WAKE_MAGIC ; -if (wol->wolopts &WAKE_PHY ) - pdata->wol |=WAKE_PHY ; -if (wol->wolopts &WAKE_ARP ) - pdata->wol |=WAKE_ARP ; +if (wol->wolopts & ~WAKE_ALL ) +return -EINVAL ; + + pdata->wol = wol->wolopts;device_set_wakeup_enable (&dev->udev->dev, (bool )wol->wolopts);
RE: [PATCH net v2 3/7] lan78xx: Check for supported Wake-on-LAN modes
Quoted 5 lines
The driver supports a fair amount of Wake-on-LAN modes, but is not checking that the user specified one that is supported.
Fixes 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")Signed-off-by Florian Fainelli <[email protected]>
Thanks.
Woojung
PATCH v2 4/7 sr9800: Check for supported Wake-on-LAN modes
In reply to Florian FainelliThe driver currently silently accepts unsupported Wake-on-LAN modes (other than WAKE_PHY or WAKE_MAGIC) without reporting that to the user, which is confusing.
--- drivers/net/usb/sr9800.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/sr9800.c +3 -0
@@ -421,6 +421,9 @@ sr_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)struct usbnet *dev =netdev_priv (net);u8 opt =0 ; +if (wolinfo->wolopts & ~(WAKE_PHY |WAKE_MAGIC )) +return -EINVAL ; +if (wolinfo->wolopts &WAKE_PHY ) opt |=SR_MONITOR_LINK ;if (wolinfo->wolopts &WAKE_MAGIC )
PATCH v2 5/7 r8152: Check for supported Wake-on-LAN Modes
In reply to Florian FainelliThe driver does not check for Wake-on-LAN modes specified by an user, but will conditionally set the device as wake-up enabled or not based on that, which could be a very confusing user experience.
--- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/r8152.c +3 -0
@@ -4506,6 +4506,9 @@ static int rtl8152_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)if (!rtl_can_wakeup (tp))return -EOPNOTSUPP ; +if (wol->wolopts & ~WAKE_ANY ) +return -EINVAL ; + ret =usb_autopm_get_interface (tp->intf);if (ret <0 ) goto out_set_wol;
PATCH v2 6/7 smsc75xx: Check for Wake-on-LAN modes
In reply to Florian FainelliThe driver does not check for Wake-on-LAN modes specified by an user, but will conditionally set the device as wake-up enabled or not based on that, which could be a very confusing user experience.
--- drivers/net/usb/smsc75xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/smsc75xx.c +3 -0
@@ -731,6 +731,9 @@ static int smsc75xx_ethtool_set_wol(struct net_device *net,struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0 ]);int ret; +if (wolinfo->wolopts & ~SUPPORTED_WAKE ) +return -EINVAL ; + pdata->wolopts = wolinfo->wolopts &SUPPORTED_WAKE ; ret =device_set_wakeup_enable (&dev->udev->dev, pdata->wolopts);
PATCH v2 7/7 smsc95xx: Check for Wake-on-LAN modes
In reply to Florian FainelliThe driver does not check for Wake-on-LAN modes specified by an user, but will conditionally set the device as wake-up enabled or not based on that, which could be a very confusing user experience.
--- drivers/net/usb/smsc95xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/smsc95xx.c +3 -0
@@ -774,6 +774,9 @@ static int smsc95xx_ethtool_set_wol(struct net_device *net,struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0 ]);int ret; +if (wolinfo->wolopts & ~SUPPORTED_WAKE ) +return -EINVAL ; + pdata->wolopts = wolinfo->wolopts &SUPPORTED_WAKE ; ret =device_set_wakeup_enable (&dev->udev->dev, pdata->wolopts);
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Fri, 28 Sep 2018 16:18:49 -0700
Quoted 10 lines
Most of our USB Ethernet drivers don't seem to be checking properly whether the user is supplying a correct Wake-on-LAN mode to enter, so the experience as an user could be confusing, since it would generally lead to either no wake-up, or the device not being marked for wake-up.
Please review!
Changes in v2:
- fixed lan78xx handling, thanks Woojung!
Series applied, thanks Florian.