Skip to content

Commit b4b47ec

Browse files
committed
net: atlantic: fix aq_vec index out of range error
jira VULN-71367 cve CVE-2022-50066 commit-author Chia-Lin Kao (AceLan) <[email protected]> commit 2ba5e47 upstream-diff There was a merge conflict due to the CentOS 7 tree being old but it was minor. The final update statement of the for loop exceeds the array range, the dereference of self->aq_vec[i] is not checked and then leads to the index out of range error. Also fixed this kind of coding style in other for loop. [ 97.937604] UBSAN: array-index-out-of-bounds in drivers/net/ethernet/aquantia/atlantic/aq_nic.c:1404:48 [ 97.937607] index 8 is out of range for type 'aq_vec_s *[8]' [ 97.937608] CPU: 38 PID: 3767 Comm: kworker/u256:18 Not tainted 5.19.0+ #2 [ 97.937610] Hardware name: Dell Inc. Precision 7865 Tower/, BIOS 1.0.0 06/12/2022 [ 97.937611] Workqueue: events_unbound async_run_entry_fn [ 97.937616] Call Trace: [ 97.937617] <TASK> [ 97.937619] dump_stack_lvl+0x49/0x63 [ 97.937624] dump_stack+0x10/0x16 [ 97.937626] ubsan_epilogue+0x9/0x3f [ 97.937627] __ubsan_handle_out_of_bounds.cold+0x44/0x49 [ 97.937629] ? __scm_send+0x348/0x440 [ 97.937632] ? aq_vec_stop+0x72/0x80 [atlantic] [ 97.937639] aq_nic_stop+0x1b6/0x1c0 [atlantic] [ 97.937644] aq_suspend_common+0x88/0x90 [atlantic] [ 97.937648] aq_pm_suspend_poweroff+0xe/0x20 [atlantic] [ 97.937653] pci_pm_suspend+0x7e/0x1a0 [ 97.937655] ? pci_pm_suspend_noirq+0x2b0/0x2b0 [ 97.937657] dpm_run_callback+0x54/0x190 [ 97.937660] __device_suspend+0x14c/0x4d0 [ 97.937661] async_suspend+0x23/0x70 [ 97.937663] async_run_entry_fn+0x33/0x120 [ 97.937664] process_one_work+0x21f/0x3f0 [ 97.937666] worker_thread+0x4a/0x3c0 [ 97.937668] ? process_one_work+0x3f0/0x3f0 [ 97.937669] kthread+0xf0/0x120 [ 97.937671] ? kthread_complete_and_exit+0x20/0x20 [ 97.937672] ret_from_fork+0x22/0x30 [ 97.937676] </TASK> v2. fixed "warning: variable 'aq_vec' set but not used" v3. simplified a for loop Fixes: 97bde5c ("net: ethernet: aquantia: Support for NIC-specific code") Signed-off-by: Chia-Lin Kao (AceLan) <[email protected]> Acked-by: Sudarsana Reddy Kalluru <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit 2ba5e47) Signed-off-by: Anmol Jain <[email protected]> Resolve merge conflicts Kept upstream logic and adjusted local error accordingly
1 parent f8e4717 commit b4b47ec

File tree

1 file changed

+9
-13
lines changed
  • drivers/net/ethernet/aquantia/atlantic

1 file changed

+9
-13
lines changed

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,10 @@ static void aq_nic_service_timer_cb(struct timer_list *t)
191191
static void aq_nic_polling_timer_cb(struct timer_list *t)
192192
{
193193
struct aq_nic_s *self = from_timer(self, t, polling_timer);
194-
struct aq_vec_s *aq_vec = NULL;
195194
unsigned int i = 0U;
196195

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

201199
mod_timer(&self->polling_timer, jiffies +
202200
AQ_CFG_POLLING_TIMER_INTERVAL);
@@ -653,7 +651,6 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)
653651
{
654652
unsigned int i = 0U;
655653
unsigned int count = 0U;
656-
struct aq_vec_s *aq_vec = NULL;
657654
struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);
658655

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

687684
data += i;
688685

689-
for (i = 0U, aq_vec = self->aq_vec[0];
690-
aq_vec && self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) {
686+
for (i = 0U; self->aq_vecs > i; ++i) {
687+
if (!self->aq_vec[i])
688+
break;
691689
data += count;
692-
aq_vec_get_sw_stats(aq_vec, data, &count);
690+
aq_vec_get_sw_stats(self->aq_vec[i], data, &count);
693691
}
694692

695693
err_exit:;
@@ -867,7 +865,6 @@ u32 aq_nic_get_fw_version(struct aq_nic_s *self)
867865

868866
int aq_nic_stop(struct aq_nic_s *self)
869867
{
870-
struct aq_vec_s *aq_vec = NULL;
871868
unsigned int i = 0U;
872869

873870
netif_tx_disable(self->ndev);
@@ -882,9 +879,8 @@ int aq_nic_stop(struct aq_nic_s *self)
882879
else
883880
aq_pci_func_free_irqs(self);
884881

885-
for (i = 0U, aq_vec = self->aq_vec[0];
886-
self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])
887-
aq_vec_stop(aq_vec);
882+
for (i = 0U; self->aq_vecs > i; ++i)
883+
aq_vec_stop(self->aq_vec[i]);
888884

889885
return self->aq_hw_ops->hw_stop(self->aq_hw);
890886
}
@@ -986,4 +982,4 @@ void aq_nic_shutdown(struct aq_nic_s *self)
986982

987983
err_exit:
988984
rtnl_unlock();
989-
}
985+
}

0 commit comments

Comments
 (0)