openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

aquantia: Fix "ethtool -S" crash when adapter down. 

This patch fixes the crash that happens when driver tries to collect statistics
from already released "aq_vec" object.
If adapter is in "down" state we still allow user to see statistics from HW.

V2: fixed braces around "aq_vec_free".

Fixes: 97bde5c4f9 ("net: ethernet: aquantia: Support for NIC-specific code")
Signed-off-by: Pavel Belous <pavel.belous@aquantia.com>
Tested-by: David Arcari <darcari@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Belous 2017-05-04 23:10:56 +03:00 committed by David S. Miller
parent 2c041afc5a
commit 3013c4983e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/aquantia/atlantic/aq_nic.c
View File

@ -755,7 +755,7 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
count = 0U; count = 0U;
for (i = 0U, aq_vec = self->aq_vec[0]; for (i = 0U, aq_vec = self->aq_vec[0];
self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) { aq_vec && self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) {
data += count; data += count;
aq_vec_get_sw_stats(aq_vec, data, &count); aq_vec_get_sw_stats(aq_vec, data, &count);
} }
@ -959,8 +959,10 @@ void aq_nic_free_hot_resources(struct aq_nic_s *self)
goto err_exit; goto err_exit;
for (i = AQ_DIMOF(self->aq_vec); i--;) { for (i = AQ_DIMOF(self->aq_vec); i--;) {
if (self->aq_vec[i]) if (self->aq_vec[i]) {
aq_vec_free(self->aq_vec[i]); aq_vec_free(self->aq_vec[i]);
self->aq_vec[i] = NULL;
}
} }
err_exit:; err_exit:;