Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index ce91766..ab5fa63 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -82,6 +82,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN]
        [NETIF_F_FSO_BIT] =              "tx-fcoe-segmentation",
        [NETIF_F_GSO_GRE_BIT] =          "tx-gre-segmentation",
        [NETIF_F_GSO_UDP_TUNNEL_BIT] =   "tx-udp_tnl-segmentation",
+       [NETIF_F_GSO_MPLS_BIT] =         "tx-mpls-segmentation",
 
        [NETIF_F_FCOE_CRC_BIT] =         "tx-checksum-fcoe-crc",
        [NETIF_F_SCTP_CSUM_BIT] =        "tx-checksum-sctp",
@@ -1319,10 +1320,19 @@ static int ethtool_get_dump_data(struct net_device *dev,
        if (ret)
                return ret;
 
-       len = (tmp.len > dump.len) ? dump.len : tmp.len;
+       len = min(tmp.len, dump.len);
        if (!len)
                return -EFAULT;
 
+       /* Don't ever let the driver think there's more space available
+        * than it requested with .get_dump_flag().
+        */
+       dump.len = len;
+
+       /* Always allocate enough space to hold the whole thing so that the
+        * driver does not need to check the length and bother with partial
+        * dumping.
+        */
        data = vzalloc(tmp.len);
        if (!data)
                return -ENOMEM;
@@ -1330,6 +1340,16 @@ static int ethtool_get_dump_data(struct net_device *dev,
        if (ret)
                goto out;
 
+       /* There are two sane possibilities:
+        * 1. The driver's .get_dump_data() does not touch dump.len.
+        * 2. Or it may set dump.len to how much it really writes, which
+        *    should be tmp.len (or len if it can do a partial dump).
+        * In any case respond to userspace with the actual length of data
+        * it's receiving.
+        */
+       WARN_ON(dump.len != len && dump.len != tmp.len);
+       dump.len = len;
+
        if (copy_to_user(useraddr, &dump, sizeof(dump))) {
                ret = -EFAULT;
                goto out;
@@ -1413,7 +1433,7 @@ static int ethtool_get_module_eeprom(struct net_device *dev,
                                      modinfo.eeprom_len);
 }
 
-/* The main entry point in this file.  Called from net/core/dev.c */
+/* The main entry point in this file.  Called from net/core/dev_ioctl.c */
 
 int dev_ethtool(struct net *net, struct ifreq *ifr)
 {