vlan/macvlan: fix NULL pointer dereferences in ethtool handlers
Subsystems (2)
commit c9bfff86b3c8e39df7ddd34e1eac238edc5bf810
Author: Patrick McHardy <[email protected]> Date: Fri Apr 17 18:04:43 2009 +0200
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.
drivers/net/macvlan.c +6 -3
@@ -376,7 +376,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); }
@@ -387,7 +388,8 @@ static int macvlan_ethtool_get_settings(struct net_device *dev,const struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev; -if (!lowerdev->ethtool_ops->get_settings) +if (!lowerdev->ethtool_ops || + !lowerdev->ethtool_ops->get_settings)return -EOPNOTSUPP ;return lowerdev->ethtool_ops->get_settings (lowerdev, cmd);
@@ -398,7 +400,8 @@ static u32 macvlan_ethtool_get_flags(struct net_device *dev)const struct macvlan_dev *vlan =netdev_priv (dev);struct net_device *lowerdev = vlan->lowerdev; -if (!lowerdev->ethtool_ops->get_flags) +if (!lowerdev->ethtool_ops || + !lowerdev->ethtool_ops->get_flags)return 0 ;return lowerdev->ethtool_ops->get_flags (lowerdev); }
net/8021q/vlan_dev.c +2 -1
@@ -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);
From: Patrick McHardy <[email protected]>
Date: Fri, 17 Apr 2009 18:05:32 +0200
Quoted 7 lines
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 <[email protected]>Signed-off-by Patrick McHardy <[email protected]>
Applied, thanks Patrick.
These things beg for helper functions in my opinion.
Quoted 8 lines · David Miller
From: Patrick McHardy <[email protected]>
Date: Fri, 17 Apr 2009 18:05:32 +0200Quoted 5 lines
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.
Quoted 6 lines
Quoted 2 lines
Reported-by Art van Breemen <[email protected]>Signed-off-by Patrick McHardy <[email protected]>Applied, thanks Patrick.
These things beg for helper functions in my opinion.
Something like this?
commit ff0b17b20d79b5aecc86fff587d957fe11c638fb
Author: Patrick McHardy <[email protected]> Date: Mon Apr 20 16:46:48 2009 +0200
net: factor out ethtool invocation of vlan/macvlan drivers
drivers/net/macvlan.c +3 -19
@@ -374,36 +374,20 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,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 ==NULL || - lowerdev->ethtool_ops->get_rx_csum ==NULL ) -return 0 ; -return lowerdev->ethtool_ops->get_rx_csum (lowerdev); +return dev_ethtool_get_rx_csum (vlan->lowerdev); }static int macvlan_ethtool_get_settings (struct net_device *dev,struct ethtool_cmd *cmd) {const struct macvlan_dev *vlan =netdev_priv (dev); -struct net_device *lowerdev = vlan->lowerdev; - -if (!lowerdev->ethtool_ops || - !lowerdev->ethtool_ops->get_settings) -return -EOPNOTSUPP ; - -return lowerdev->ethtool_ops->get_settings (lowerdev, cmd); +return dev_ethtool_get_settings (vlan->lowerdev, cmd); }static u32 macvlan_ethtool_get_flags (struct net_device *dev) {const struct macvlan_dev *vlan =netdev_priv (dev); -struct net_device *lowerdev = vlan->lowerdev; - -if (!lowerdev->ethtool_ops || - !lowerdev->ethtool_ops->get_flags) -return 0 ; -return lowerdev->ethtool_ops->get_flags (lowerdev); +return dev_ethtool_get_flags (vlan->lowerdev); }static const struct ethtool_ops macvlan_ethtool_ops = {
include/linux/netdevice.h +23 -1
@@ -42,6 +42,7 @@#include <linux/dmaengine.h> #include <linux/workqueue.h> +#include <linux/ethtool.h> #include <net/net_namespace.h> #include <net/dsa.h> #ifdef CONFIG_DCB
@@ -49,7 +50,6 @@#endif struct vlan_group ; -struct ethtool_ops ;struct netpoll_info ;/* 802.11 specific */ struct wireless_dev ;
@@ -1908,6 +1908,28 @@ static inline int skb_bond_should_drop(struct sk_buff *skb) }extern struct pernet_operations __net_initdata loopback_net_ops; + +static inline int dev_ethtool_get_settings (struct net_device *dev, +struct ethtool_cmd *cmd) +{ +if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings) +return -EOPNOTSUPP ; +return dev->ethtool_ops->get_settings (dev, cmd); +} + +static inline u32 dev_ethtool_get_rx_csum (struct net_device *dev) +{ +if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum) +return 0 ; +return dev->ethtool_ops->get_rx_csum (dev); +} + +static inline u32 dev_ethtool_get_flags (struct net_device *dev) +{ +if (!dev->ethtool_ops || !dev->ethtool_ops->get_flags) +return 0 ; +return dev->ethtool_ops->get_flags (dev); +}#endif /* __KERNEL__ */ #endif /* _LINUX_DEV_H */
net/8021q/vlan_dev.c +3 -20
@@ -666,13 +666,7 @@ static int vlan_ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) {const struct vlan_dev_info *vlan =vlan_dev_info (dev); -struct net_device *real_dev = vlan->real_dev; - -if (!real_dev->ethtool_ops || - !real_dev->ethtool_ops->get_settings) -return -EOPNOTSUPP ; - -return real_dev->ethtool_ops->get_settings (real_dev, cmd); +return dev_ethtool_get_settings (vlan->real_dev, cmd); } static void vlan_ethtool_get_drvinfo(struct net_device *dev,
@@ -686,24 +680,13 @@ static void vlan_ethtool_get_drvinfo(struct net_device *dev,static u32 vlan_ethtool_get_rx_csum (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 ==NULL || - real_dev->ethtool_ops->get_rx_csum ==NULL ) -return 0 ; -return real_dev->ethtool_ops->get_rx_csum (real_dev); +return dev_ethtool_get_rx_csum (vlan->real_dev); }static u32 vlan_ethtool_get_flags (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->features &NETIF_F_HW_VLAN_RX ) || - real_dev->ethtool_ops ==NULL || - real_dev->ethtool_ops->get_flags ==NULL ) -return 0 ; -return real_dev->ethtool_ops->get_flags (real_dev); +return dev_ethtool_get_flags (vlan->real_dev); }static const struct ethtool_ops vlan_ethtool_ops = {