Merge branch 'net-usb-Check-for-Wake-on-LAN-modes'

Florian Fainelli says:

====================
net: usb: Check for Wake-on-LAN modes

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!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 22 insertions, 13 deletions

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index e95dd12edec4..023b8d0bf175 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -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)
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 9e8ad372f419..2207f7a7d1ff 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -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)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index a9991c5f4736..c3c9ba44e2a1 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -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);
 
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 2cd71bdb6484..f1b5201cc320 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -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;
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 05553d252446..e5a4cbb366dc 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -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);
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 06b4d290784d..262e7a3c23cb 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -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);
diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 9277a0f228df..35f39f23d881 100644
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -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)