From 708f2c81c4de7b2660ca4703ba00e541f750b7e4 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 26 May 2009 15:49:11 -0700 Subject: [PATCH] vlan/macvlan: fix NULL pointer dereferences in ethtool handlers [ Upstream commit 7816a0a862d851d0b05710e7d94bfe390f3180e2 ] 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 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macvlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 42394505bb50b..1aa0388146568 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -328,7 +328,8 @@ static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev) const struct macvlan_dev *vlan = netdev_priv(dev); struct net_device *lowerdev = vlan->lowerdev; - if (lowerdev->ethtool_ops->get_rx_csum == NULL) + if (lowerdev->ethtool_ops == NULL || + lowerdev->ethtool_ops->get_rx_csum == NULL) return 0; return lowerdev->ethtool_ops->get_rx_csum(lowerdev); } -- 2.47.3