vlan/macvlan: fix NULL pointer dereferences in ethtool handlers
Check whether the underlying device provides a set of ethtool ops before checking for individual handlers to avoid NULL pointer dereferences. Reported-by: Art van Breemen <ard@telegraafnet.nl> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
75a241f959
commit
7816a0a862
@@ -668,7 +668,8 @@ static int vlan_ethtool_get_settings(struct net_device *dev,
|
||||
const struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
||||
struct net_device *real_dev = vlan->real_dev;
|
||||
|
||||
if (!real_dev->ethtool_ops->get_settings)
|
||||
if (!real_dev->ethtool_ops ||
|
||||
!real_dev->ethtool_ops->get_settings)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
return real_dev->ethtool_ops->get_settings(real_dev, cmd);
|
||||
|
Reference in New Issue
Block a user