Skip to content

[CBR 7.9] net: atlantic: fix aq_vec index out of range error #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: ciqcbr7_9
Choose a base branch
from
Open

[CBR 7.9] net: atlantic: fix aq_vec index out of range error #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions drivers/net/ethernet/aquantia/atlantic/aq_nic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,10 @@ static void aq_nic_service_timer_cb(struct timer_list *t)
static void aq_nic_polling_timer_cb(struct timer_list *t)
{
struct aq_nic_s *self = from_timer(self, t, polling_timer);
struct aq_vec_s *aq_vec = NULL;
unsigned int i = 0U;

for (i = 0U, aq_vec = self->aq_vec[0];
self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])
aq_vec_isr(i, (void *)aq_vec);
for (i = 0U; self->aq_vecs > i; ++i)
aq_vec_isr(i, (void *)self->aq_vec[i]);

mod_timer(&self->polling_timer, jiffies +
AQ_CFG_POLLING_TIMER_INTERVAL);
Expand Down Expand Up @@ -653,7 +651,6 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
{
unsigned int i = 0U;
unsigned int count = 0U;
struct aq_vec_s *aq_vec = NULL;
struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);

if (!stats)
Expand Down Expand Up @@ -686,10 +683,11 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)

data += i;

for (i = 0U, aq_vec = self->aq_vec[0];
aq_vec && self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) {
for (i = 0U; self->aq_vecs > i; ++i) {
if (!self->aq_vec[i])
break;
data += count;
aq_vec_get_sw_stats(aq_vec, data, &count);
aq_vec_get_sw_stats(self->aq_vec[i], data, &count);
}

err_exit:;
Expand Down Expand Up @@ -867,7 +865,6 @@ u32 aq_nic_get_fw_version(struct aq_nic_s *self)

int aq_nic_stop(struct aq_nic_s *self)
{
struct aq_vec_s *aq_vec = NULL;
unsigned int i = 0U;

netif_tx_disable(self->ndev);
Expand All @@ -882,9 +879,8 @@ int aq_nic_stop(struct aq_nic_s *self)
else
aq_pci_func_free_irqs(self);

for (i = 0U, aq_vec = self->aq_vec[0];
self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])
aq_vec_stop(aq_vec);
for (i = 0U; self->aq_vecs > i; ++i)
aq_vec_stop(self->aq_vec[i]);

return self->aq_hw_ops->hw_stop(self->aq_hw);
}
Expand Down Expand Up @@ -986,4 +982,4 @@ void aq_nic_shutdown(struct aq_nic_s *self)

err_exit:
rtnl_unlock();
}
}