diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2011-04-08 16:07:22 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 00:20:49 +0400 |
| commit | 5d9f11cf5038587cc53975deb8beaa1a876a7a7b (patch) | |
| tree | a3a3705f4ec33b0c8de803d82c8107a4b921b768 | |
| parent | 8d7dfc2b57bb2cad0731dedd58ec1d70bcca1ccf (diff) | |
| download | linux-5d9f11cf5038587cc53975deb8beaa1a876a7a7b.tar.xz | |
ethtool: prevent null pointer dereference with NTUPLE set but no set_rx_ntuple
This change is meant to prevent a possible null pointer dereference if
NETIF_F_NTUPLE is defined but the set_rx_ntuple function pointer is not.
The main motivation behind this patch is to eventually replace the ntuple
interfaces entirely with the network flow classifier interfaces. This
allows the device drivers to maintain the ntuple check internally while
using the network flow classifier interface for setting up and displaying
rules.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/ethtool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 1b7fa984de7d..704e176ad3a9 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -910,6 +910,9 @@ static noinline_for_stack int ethtool_set_rx_ntuple(struct net_device *dev, struct ethtool_rx_ntuple_flow_spec_container *fsc = NULL; int ret; + if (!ops->set_rx_ntuple) + return -EOPNOTSUPP; + if (!(dev->features & NETIF_F_NTUPLE)) return -EINVAL; |