ethtool: Make more commands available to unprivileged processes

'Get' commands should generally not require CAP_NET_ADMIN, with
the exception of those that expose internal state.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index c73d0a59212c..cbf033dcaf1f 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1443,6 +1443,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GSET:
         case ETHTOOL_GDRVINFO:
         case ETHTOOL_GMSGLVL:
+        case ETHTOOL_GLINK:
         case ETHTOOL_GCOALESCE:
         case ETHTOOL_GRINGPARAM:
         case ETHTOOL_GPAUSEPARAM:
@@ -1451,6 +1452,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GSG:
         case ETHTOOL_GSSET_INFO:
         case ETHTOOL_GSTRINGS:
+        case ETHTOOL_GSTATS:
         case ETHTOOL_GTSO:
         case ETHTOOL_GPERMADDR:
         case ETHTOOL_GUFO:
@@ -1463,8 +1465,11 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GRXCLSRLCNT:
         case ETHTOOL_GRXCLSRULE:
         case ETHTOOL_GRXCLSRLALL:
+        case ETHTOOL_GRXFHINDIR:
         case ETHTOOL_GFEATURES:
+        case ETHTOOL_GCHANNELS:
         case ETHTOOL_GET_TS_INFO:
+        case ETHTOOL_GEEE:
                 break;
         default:
                 if (!capable(CAP_NET_ADMIN))