nfp: return -EOPNOTSUPP from .ndo_get_phys_port_name for VFs
authorJakub Kicinski <jakub.kicinski@netronome.com>
Sat, 26 May 2018 04:53:25 +0000 (21:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 May 2018 13:49:15 +0000 (09:49 -0400)
After recent change we started returning 0 from
ndo_get_phys_port_name for VFs.  The name parameter for
ndo_get_phys_port_name is not initialized by the stack so
this can lead to a crash.  We should have kept returning
-EOPNOTSUPP in the first place.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/nfp_net_common.c

index eea11e881bf53c52b7ce35478c675f869f6c375b..1f572896d1ee18712c16f4e19a02387973543cc7 100644 (file)
@@ -3286,11 +3286,12 @@ nfp_net_get_phys_port_name(struct net_device *netdev, char *name, size_t len)
        if (nn->port)
                return nfp_port_get_phys_port_name(netdev, name, len);
 
-       if (!nn->dp.is_vf) {
-               n = snprintf(name, len, "%d", nn->id);
-               if (n >= len)
-                       return -EINVAL;
-       }
+       if (nn->dp.is_vf)
+               return -EOPNOTSUPP;
+
+       n = snprintf(name, len, "%d", nn->id);
+       if (n >= len)
+               return -EINVAL;
 
        return 0;
 }