ethtool: fix setting key and resetting indir at once

The indirection table and the key follow struct ethtool_rxfh
in user memory.

To reset the indirection table user space calls SET_RXFH with
table of size 0 (OTOH to say "no change" it should use -1 / ~0).
The logic for calculating the offset where they key sits is
incorrect in this case, as kernel would still offset by the full
table length, while for the reset there is no indir table and
key is immediately after the struct.

  $ ethtool -X eth0 default hkey 01:02:03...
  $ ethtool -x eth0
  [...]
  RSS hash key:
00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00
  [...]

Fixes: 3de0b592394d ("ethtool: Support for configurable RSS hash key")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 983fee76f5cf15e6b9142e32c632b175d6a8df5e..a37ba113610a81fa181503e4c05436e21239a6aa 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1331,13 +1331,13 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
        u32 rss_cfg_offset = offsetof(struct ethtool_rxfh, rss_config[0]);
        const struct ethtool_ops *ops = dev->ethtool_ops;
        u32 dev_indir_size = 0, dev_key_size = 0, i;
+       u32 user_indir_len = 0, indir_bytes = 0;
        struct ethtool_rxfh_param rxfh_dev = {};
        struct ethtool_rxfh_context *ctx = NULL;
        struct netlink_ext_ack *extack = NULL;
        struct ethtool_rxnfc rx_rings;
        struct ethtool_rxfh rxfh;
        bool locked = false; /* dev->ethtool->rss_lock taken */
-       u32 indir_bytes = 0;
        bool create = false;
        u8 *rss_config;
        int ret;
@@ -1400,6 +1400,7 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
         */
        if (rxfh.indir_size &&
            rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE) {
+               user_indir_len = indir_bytes;
                rxfh_dev.indir = (u32 *)rss_config;
                rxfh_dev.indir_size = dev_indir_size;
                ret = ethtool_copy_validate_indir(rxfh_dev.indir,
@@ -1426,7 +1427,7 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
                rxfh_dev.key_size = dev_key_size;
                rxfh_dev.key = rss_config + indir_bytes;
                if (copy_from_user(rxfh_dev.key,
-                                  useraddr + rss_cfg_offset + indir_bytes,
+                                  useraddr + rss_cfg_offset + user_indir_len,
                                   rxfh.key_size)) {
                        ret = -EFAULT;
                        goto out;