On 04.05.2017 20:00, David Arcari wrote:
Hi Pavel, On 05/04/2017 12:33 PM, Pavel Belous wrote:From: Pavel Belous <pavel.bel...@aquantia.com> This patch fixes the crash that happens when driver tries to collect statistics from already released "aq_vec" object. Fixes: 97bde5c4f909 ("net: ethernet: aquantia: Support for NIC-specific code") Signed-off-by: Pavel Belous <pavel.bel...@aquantia.com> --- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index cdb0299..3a32573 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -755,7 +755,7 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data) count = 0U; 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; aq_vec_get_sw_stats(aq_vec, data, &count); } @@ -961,6 +961,7 @@ void aq_nic_free_hot_resources(struct aq_nic_s *self) for (i = AQ_DIMOF(self->aq_vec); i--;) { if (self->aq_vec[i]) aq_vec_free(self->aq_vec[i]); + self->aq_vec[i] = NULL;I think you intended to to add { } to the if statement. The code compiles as is, but the indentation is not correct. -DA
Oh. Sorry about that. I did not see the loss of braces during merge. I will prepare another patch with Lino and David M. comments. Regards, Pavel.
} err_exit:;
