Commit 474ff260 authored Sep 22, 2018 by Maciej Żenczykowski Committed by David S. Miller Sep 22, 2018

net-ethtool: ETHTOOL_GUFO did not and should not require CAP_NET_ADMIN

So it should not fail with EPERM even though it is no longer implemented...

This is a fix for:
  (userns)$ egrep ^Cap /proc/self/status
  CapInh: 0000003fffffffff
  CapPrm: 0000003fffffffff
  CapEff: 0000003fffffffff
  CapBnd: 0000003fffffffff
  CapAmb: 0000003fffffffff

  (userns)$ tcpdump -i usb_rndis0
  tcpdump: WARNING: usb_rndis0: SIOCETHTOOL(ETHTOOL_GUFO) ioctl failed: Operation not permitted
  Warning: Kernel filter failed: Bad file descriptor
  tcpdump: can't remove kernel filter: Bad file descriptor

With this change it returns EOPNOTSUPP instead of EPERM.

See also https://github.com/the-tcpdump-group/libpcap/issues/689



Fixes: 08a00fea "net: Remove references to NETIF_F_UFO from ethtool."
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8360ed67

net/core/ethtool.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2624,6 +2624,7 @@ int dev_ethtool(struct net net, struct ifreq ifr)
		case ETHTOOL_GPHYSTATS:
		case ETHTOOL_GTSO:
		case ETHTOOL_GPERMADDR:
		case ETHTOOL_GUFO:
		case ETHTOOL_GGSO:
		case ETHTOOL_GGRO:
		case ETHTOOL_GFLAGS:

Admin message