Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next

Ben Hutchings says:

====================
Pull request: Fixes for new ethtool RSS commands

This addresses several problems I previously identified with the new
ETHTOOL_{G,S}RSSH commands:

1. Missing validation of reserved parameters
2. Vague documentation
3. Use of unnamed magic number
4. No consolidation with existing driver operations

I don't currently have access to suitable network hardware, but have
tested these changes with a dummy driver that can support various
combinations of operations and sizes, together with (a) Debian's ethtool
3.13 (b) ethtool 3.14 with the submitted patch to use ETHTOOL_{G,S}RSSH
and minor adjustment for fixes 1 and 3.

v2: Update RSS operations in vmxnet3 too
====================

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

1 files changed, 48 insertions, 62 deletions

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index aa8978ac47d2..17cb912793fa 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -561,19 +561,17 @@ static int ethtool_copy_validate_indir(u32 *indir, void __user *useraddr,
                                         struct ethtool_rxnfc *rx_rings,
                                         u32 size)
 {
-        int ret = 0, i;
+        int i;
 
         if (copy_from_user(indir, useraddr, size * sizeof(indir[0])))
-                ret = -EFAULT;
+                return -EFAULT;
 
         /* Validate ring indices */
-        for (i = 0; i < size; i++) {
-                if (indir[i] >= rx_rings->data) {
-                        ret = -EINVAL;
-                        break;
-                }
-        }
-        return ret;
+        for (i = 0; i < size; i++)
+                if (indir[i] >= rx_rings->data)
+                        return -EINVAL;
+
+        return 0;
 }
 
 static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,
@@ -584,7 +582,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,
         int ret;
 
         if (!dev->ethtool_ops->get_rxfh_indir_size ||
-            !dev->ethtool_ops->get_rxfh_indir)
+            !dev->ethtool_ops->get_rxfh)
                 return -EOPNOTSUPP;
         dev_size = dev->ethtool_ops->get_rxfh_indir_size(dev);
         if (dev_size == 0)
@@ -610,7 +608,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,
         if (!indir)
                 return -ENOMEM;
 
-        ret = dev->ethtool_ops->get_rxfh_indir(dev, indir);
+        ret = dev->ethtool_ops->get_rxfh(dev, indir, NULL);
         if (ret)
                 goto out;
 
@@ -634,7 +632,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,
         int ret;
         u32 ringidx_offset = offsetof(struct ethtool_rxfh_indir, ring_index[0]);
 
-        if (!ops->get_rxfh_indir_size || !ops->set_rxfh_indir ||
+        if (!ops->get_rxfh_indir_size || !ops->set_rxfh ||
             !ops->get_rxnfc)
                 return -EOPNOTSUPP;
 
@@ -671,7 +669,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,
                         goto out;
         }
 
-        ret = ops->set_rxfh_indir(dev, indir);
+        ret = ops->set_rxfh(dev, indir, NULL);
 
 out:
         kfree(indir);
@@ -683,11 +681,11 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,
 {
         int ret;
         const struct ethtool_ops *ops = dev->ethtool_ops;
-        u32 user_indir_size = 0, user_key_size = 0;
+        u32 user_indir_size, user_key_size;
         u32 dev_indir_size = 0, dev_key_size = 0;
+        struct ethtool_rxfh rxfh;
         u32 total_size;
-        u32 indir_offset, indir_bytes;
-        u32 key_offset;
+        u32 indir_bytes;
         u32 *indir = NULL;
         u8 *hkey = NULL;
         u8 *rss_config;
@@ -699,33 +697,24 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,
 
         if (ops->get_rxfh_indir_size)
                 dev_indir_size = ops->get_rxfh_indir_size(dev);
-
-        indir_offset = offsetof(struct ethtool_rxfh, indir_size);
-
-        if (copy_from_user(&user_indir_size,
-                           useraddr + indir_offset,
-                           sizeof(user_indir_size)))
-                return -EFAULT;
-
-        if (copy_to_user(useraddr + indir_offset,
-                         &dev_indir_size, sizeof(dev_indir_size)))
-                return -EFAULT;
-
         if (ops->get_rxfh_key_size)
                 dev_key_size = ops->get_rxfh_key_size(dev);
 
         if ((dev_key_size + dev_indir_size) == 0)
                 return -EOPNOTSUPP;
 
-        key_offset = offsetof(struct ethtool_rxfh, key_size);
-
-        if (copy_from_user(&user_key_size,
-                           useraddr + key_offset,
-                           sizeof(user_key_size)))
+        if (copy_from_user(&rxfh, useraddr, sizeof(rxfh)))
                 return -EFAULT;
+        user_indir_size = rxfh.indir_size;
+        user_key_size = rxfh.key_size;
 
-        if (copy_to_user(useraddr + key_offset,
-                         &dev_key_size, sizeof(dev_key_size)))
+        /* Check that reserved fields are 0 for now */
+        if (rxfh.rss_context || rxfh.rsvd[0] || rxfh.rsvd[1])
+                return -EINVAL;
+
+        rxfh.indir_size = dev_indir_size;
+        rxfh.key_size = dev_key_size;
+        if (copy_to_user(useraddr, &rxfh, sizeof(rxfh)))
                 return -EFAULT;
 
         /* If the user buffer size is 0, this is just a query for the
@@ -770,12 +759,11 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
         int ret;
         const struct ethtool_ops *ops = dev->ethtool_ops;
         struct ethtool_rxnfc rx_rings;
-        u32 user_indir_size = 0, dev_indir_size = 0, i;
-        u32 user_key_size = 0, dev_key_size = 0;
+        struct ethtool_rxfh rxfh;
+        u32 dev_indir_size = 0, dev_key_size = 0, i;
         u32 *indir = NULL, indir_bytes = 0;
         u8 *hkey = NULL;
         u8 *rss_config;
-        u32 indir_offset, key_offset;
         u32 rss_cfg_offset = offsetof(struct ethtool_rxfh, rss_config[0]);
 
         if (!(ops->get_rxfh_indir_size || ops->get_rxfh_key_size) ||
@@ -784,36 +772,33 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
 
         if (ops->get_rxfh_indir_size)
                 dev_indir_size = ops->get_rxfh_indir_size(dev);
-
-        indir_offset = offsetof(struct ethtool_rxfh, indir_size);
-        if (copy_from_user(&user_indir_size,
-                           useraddr + indir_offset,
-                           sizeof(user_indir_size)))
-                return -EFAULT;
-
         if (ops->get_rxfh_key_size)
                 dev_key_size = dev->ethtool_ops->get_rxfh_key_size(dev);
-
         if ((dev_key_size + dev_indir_size) == 0)
                 return -EOPNOTSUPP;
 
-        key_offset = offsetof(struct ethtool_rxfh, key_size);
-        if (copy_from_user(&user_key_size,
-                           useraddr + key_offset,
-                           sizeof(user_key_size)))
+        if (copy_from_user(&rxfh, useraddr, sizeof(rxfh)))
                 return -EFAULT;
 
+        /* Check that reserved fields are 0 for now */
+        if (rxfh.rss_context || rxfh.rsvd[0] || rxfh.rsvd[1])
+                return -EINVAL;
+
         /* If either indir or hash key is valid, proceed further.
+         * It is not valid to request that both be unchanged.
          */
-        if ((user_indir_size && ((user_indir_size != 0xDEADBEEF) &&
-                                 user_indir_size != dev_indir_size)) ||
-            (user_key_size && (user_key_size != dev_key_size)))
+        if ((rxfh.indir_size &&
+             rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE &&
+             rxfh.indir_size != dev_indir_size) ||
+            (rxfh.key_size && (rxfh.key_size != dev_key_size)) ||
+            (rxfh.indir_size == ETH_RXFH_INDIR_NO_CHANGE &&
+             rxfh.key_size == 0))
                 return -EINVAL;
 
-        if (user_indir_size != 0xDEADBEEF)
+        if (rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE)
                 indir_bytes = dev_indir_size * sizeof(indir[0]);
 
-        rss_config = kzalloc(indir_bytes + user_key_size, GFP_USER);
+        rss_config = kzalloc(indir_bytes + rxfh.key_size, GFP_USER);
         if (!rss_config)
                 return -ENOMEM;
 
@@ -822,28 +807,29 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
         if (ret)
                 goto out;
 
-        /* user_indir_size == 0 means reset the indir table to default.
-         * user_indir_size == 0xDEADBEEF means indir setting is not requested.
+        /* rxfh.indir_size == 0 means reset the indir table to default.
+         * rxfh.indir_size == ETH_RXFH_INDIR_NO_CHANGE means leave it unchanged.
          */
-        if (user_indir_size && user_indir_size != 0xDEADBEEF) {
+        if (rxfh.indir_size &&
+            rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE) {
                 indir = (u32 *)rss_config;
                 ret = ethtool_copy_validate_indir(indir,
                                                   useraddr + rss_cfg_offset,
                                                   &rx_rings,
-                                                  user_indir_size);
+                                                  rxfh.indir_size);
                 if (ret)
                         goto out;
-        } else if (user_indir_size == 0) {
+        } else if (rxfh.indir_size == 0) {
                 indir = (u32 *)rss_config;
                 for (i = 0; i < dev_indir_size; i++)
                         indir[i] = ethtool_rxfh_indir_default(i, rx_rings.data);
         }
 
-        if (user_key_size) {
+        if (rxfh.key_size) {
                 hkey = rss_config + indir_bytes;
                 if (copy_from_user(hkey,
                                    useraddr + rss_cfg_offset + indir_bytes,
-                                   user_key_size)) {
+                                   rxfh.key_size)) {
                         ret = -EFAULT;
                         goto out;
                 }