netfilter: ipset: Make sure listing doesn't grab a set which is just being destroyed.

[firefly-linux-kernel-4.4.55.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 4f6a17ef071078258e1a5c514ffe4a2cceaef8a0..b495ab1797fae303d12a3251f09b141052c1ff55 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -106,6 +106,13 @@ rss_hash_func_strings[ETH_RSS_HASH_FUNCS_COUNT][ETH_GSTRING_LEN] = {
        [ETH_RSS_HASH_XOR_BIT] =        "xor",
 };
 
+static const char
+tunable_strings[__ETHTOOL_TUNABLE_COUNT][ETH_GSTRING_LEN] = {
+       [ETHTOOL_ID_UNSPEC]     = "Unspec",
+       [ETHTOOL_RX_COPYBREAK]  = "rx-copybreak",
+       [ETHTOOL_TX_COPYBREAK]  = "tx-copybreak",
+};
+
 static int ethtool_get_features(struct net_device *dev, void __user *useraddr)
 {
        struct ethtool_gfeatures cmd = {
@@ -194,6 +201,9 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)
        if (sset == ETH_SS_RSS_HASH_FUNCS)
                return ARRAY_SIZE(rss_hash_func_strings);
 
+       if (sset == ETH_SS_TUNABLES)
+               return ARRAY_SIZE(tunable_strings);
+
        if (ops->get_sset_count && ops->get_strings)
                return ops->get_sset_count(dev, sset);
        else
@@ -211,6 +221,8 @@ static void __ethtool_get_strings(struct net_device *dev,
        else if (stringset == ETH_SS_RSS_HASH_FUNCS)
                memcpy(data, rss_hash_func_strings,
                       sizeof(rss_hash_func_strings));
+       else if (stringset == ETH_SS_TUNABLES)
+               memcpy(data, tunable_strings, sizeof(tunable_strings));
        else
                /* ops->get_strings is valid because checked earlier */
                ops->get_strings(dev, stringset, data);
@@ -358,15 +370,7 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)
        int err;
        struct ethtool_cmd cmd;
 
-       if (!dev->ethtool_ops->get_settings)
-               return -EOPNOTSUPP;
-
-       if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
-               return -EFAULT;
-
-       cmd.cmd = ETHTOOL_GSET;
-
-       err = dev->ethtool_ops->get_settings(dev, &cmd);
+       err = __ethtool_get_settings(dev, &cmd);
        if (err < 0)
                return err;