hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: pcie: don't use vid 0 

In cases of hardware or DMA error, the vid read from
a zeroed location will be 0, and we will access the rxb
at index 0 in the global table, while it may be NULL or
owned by hardware.
Invalidate vid 0 in order to detect the situation and
bail out.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Sara Sharon 2016-06-21 11:13:47 +03:00 committed by Luca Coelho
parent 3edbc7daba
commit e25d65f267
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/intel/iwlwifi/pcie/rx.c
View File

@ -960,7 +960,7 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
else else
list_add(&rxb->list, &def_rxq->rx_used); list_add(&rxb->list, &def_rxq->rx_used);
trans_pcie->global_table[i] = rxb; trans_pcie->global_table[i] = rxb;
rxb->vid = (u16)i; rxb->vid = (u16)(i + 1);
} }
iwl_pcie_rxq_alloc_rbs(trans, GFP_KERNEL, def_rxq); iwl_pcie_rxq_alloc_rbs(trans, GFP_KERNEL, def_rxq);
@ -1249,10 +1249,13 @@ restart:
*/ */
u16 vid = le32_to_cpu(rxq->used_bd[i]) & 0x0FFF; u16 vid = le32_to_cpu(rxq->used_bd[i]) & 0x0FFF;
if (WARN(vid >= ARRAY_SIZE(trans_pcie->global_table), if (WARN(!vid ||
"Invalid rxb index from HW %u\n", (u32)vid)) vid > ARRAY_SIZE(trans_pcie->global_table),
"Invalid rxb index from HW %u\n", (u32)vid)) {
iwl_force_nmi(trans);
goto out; goto out;
rxb = trans_pcie->global_table[vid]; }
rxb = trans_pcie->global_table[vid - 1];
} else { } else {
rxb = rxq->queue[i]; rxb = rxq->queue[i];
rxq->queue[i] = NULL; rxq->queue[i] = NULL;