i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rt2860: fix off-by-two access

Browse Source 
To be upstreamed to FreeBSD?

Change-Id: Ia4389f4964429f80025003f97792b1ecd1097193
Reviewed-on: https://review.haiku-os.org/c/1681
Reviewed-by: Rene Gollent <[email protected]>
This commit is contained in:
Adrien Destugues
2019-08-06 19:20:39 +00:00
committed by Rene Gollent
parent 639bb82701
commit 58d16d9fe2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860.c
+4 -1
View File
@@ -1094,10 +1094,13 @@ rt2860_drain_stats_fifo(struct rt2860_softc *sc)
DPRINTFN(4, ("tx stat 0x%08x\n", stat)); DPRINTFN(4, ("tx stat 0x%08x\n", stat));
wcid = (stat >> RT2860_TXQ_WCID_SHIFT) & 0xff; wcid = (stat >> RT2860_TXQ_WCID_SHIFT) & 0xff;
if (wcid == 0xFF)
continue;
ni = sc->wcid2ni[wcid]; ni = sc->wcid2ni[wcid];
/* if no ACK was requested, no feedback is available */ /* if no ACK was requested, no feedback is available */
if (!(stat & RT2860_TXQ_ACKREQ) || wcid == 0xff || ni == NULL) if (!(stat & RT2860_TXQ_ACKREQ) || ni == NULL)
continue; continue;
/* update per-STA AMRR stats */ /* update per-STA AMRR stats */
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2860var.h
+1 -1
View File
@@ -142,7 +142,7 @@ struct rt2860_softc {
#define RT2860_PCIE (1 << 2) #define RT2860_PCIE (1 << 2)
#define RT2860_RUNNING (1 << 3) #define RT2860_RUNNING (1 << 3)
struct ieee80211_node *wcid2ni[RT2860_WCID_MAX]; struct ieee80211_node *wcid2ni[RT2860_WCID_MAX + 1];
struct rt2860_tx_ring txq[6]; struct rt2860_tx_ring txq[6];
struct rt2860_rx_ring rxq; struct rt2860_rx_ring rxq;