leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e1000: avoid null pointer dereference on invalid stat type

Browse Source 
Currently if the stat type is invalid then data[i] is being set
either by dereferencing a null pointer p, or it is reading from
an incorrect previous location if we had a valid stat type
previously.  Fix this by skipping over the read of p on an invalid
stat type.

Detected by CoverityScan, CID#113385 ("Explicit null dereferenced")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Colin Ian King
2017-09-22 18:13:48 +01:00
committed by Jeff Kirsher
parent 44c445c3d1
commit 5983587c8c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/intel/e1000/e1000_ethtool.c
View File

@@ -1824,11 +1824,12 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
int i; int i;
char *p = NULL;
const struct e1000_stats *stat = e1000_gstrings_stats; const struct e1000_stats *stat = e1000_gstrings_stats;
e1000_update_stats(adapter); e1000_update_stats(adapter);
for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++, stat++) {
char *p;
switch (stat->type) { switch (stat->type) {
case NETDEV_STATS: case NETDEV_STATS:
p = (char *)netdev + stat->stat_offset; p = (char *)netdev + stat->stat_offset;
@@ -1839,15 +1840,13 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
default: default:
WARN_ONCE(1, "Invalid E1000 stat type: %u index %d\n", WARN_ONCE(1, "Invalid E1000 stat type: %u index %d\n",
stat->type, i); stat->type, i);
break; continue;
} }
if (stat->sizeof_stat == sizeof(u64)) if (stat->sizeof_stat == sizeof(u64))
data[i] = *(u64 *)p; data[i] = *(u64 *)p;
else else
data[i] = *(u32 *)p; data[i] = *(u32 *)p;
stat++;
} }
/* BUG_ON(i != E1000_STATS_LEN); */ /* BUG_ON(i != E1000_STATS_LEN); */
} }