aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Hay <joshua.a.hay@intel.com>2013-01-03 22:34:36 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-02-05 04:43:49 -0500
commitf752be9c3de4fbb6a9b2c060f3794bd928a0ad7a (patch)
tree2e4c62f9616136c83f11925b41973f46381e9c43
parent07ce870bed2f631ad53a2c1a90db20b5f8126ab9 (diff)
ixgbe: fix potential null dereference
This patch adds a default case which goes to the next loop iteration in the case where p is not set, preventing p from being dereferenced. Signed-off-by: Josh Hay <joshua.a.hay@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 216203ece6ed..bafd141193af 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1040,6 +1040,9 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
1040 p = (char *) adapter + 1040 p = (char *) adapter +
1041 ixgbe_gstrings_stats[i].stat_offset; 1041 ixgbe_gstrings_stats[i].stat_offset;
1042 break; 1042 break;
1043 default:
1044 data[i] = 0;
1045 continue;
1043 } 1046 }
1044 1047
1045 data[i] = (ixgbe_gstrings_stats[i].sizeof_stat == 1048 data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==