d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Temporary fix for race in RUN driver which can

Browse Source 
cause freed memory to be accessed.
- Properly lock callout_reset()'s.

MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2014-03-05 18:39:27 +00:00
parent 54332e0629
commit 44bf877e1a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/usb/wlan/if_run.c
View File

@ -2508,9 +2508,7 @@ run_ratectl_cb(void *arg, int pending)
if (vap == NULL) if (vap == NULL)
return; return;
if (sc->rvp_cnt <= 1 && vap->iv_opmode == IEEE80211_M_STA) if (sc->rvp_cnt > 1 || vap->iv_opmode != IEEE80211_M_STA) {
run_iter_func(sc, vap->iv_bss);
else {
/* /*
* run_reset_livelock() doesn't do anything with AMRR, * run_reset_livelock() doesn't do anything with AMRR,
* but Ralink wants us to call it every 1 sec. So, we * but Ralink wants us to call it every 1 sec. So, we
@ -2523,9 +2521,10 @@ run_ratectl_cb(void *arg, int pending)
/* just in case, there are some stats to drain */ /* just in case, there are some stats to drain */
run_drain_fifo(sc); run_drain_fifo(sc);
RUN_UNLOCK(sc); RUN_UNLOCK(sc);
ieee80211_iterate_nodes(&ic->ic_sta, run_iter_func, sc);
} }
ieee80211_iterate_nodes(&ic->ic_sta, run_iter_func, sc);
RUN_LOCK(sc); RUN_LOCK(sc);
if(sc->ratectl_run != RUN_RATECTL_OFF) if(sc->ratectl_run != RUN_RATECTL_OFF)
usb_callout_reset(&sc->ratectl_ch, hz, run_ratectl_to, sc); usb_callout_reset(&sc->ratectl_ch, hz, run_ratectl_to, sc);
@ -2605,6 +2604,11 @@ run_iter_func(void *arg, struct ieee80211_node *ni)
RUN_LOCK(sc); RUN_LOCK(sc);
/* Check for special case */
if (sc->rvp_cnt <= 1 && vap->iv_opmode == IEEE80211_M_STA &&
ni != vap->iv_bss)
goto fail;
if (sc->rvp_cnt <= 1 && (vap->iv_opmode == IEEE80211_M_IBSS || if (sc->rvp_cnt <= 1 && (vap->iv_opmode == IEEE80211_M_IBSS ||
vap->iv_opmode == IEEE80211_M_STA)) { vap->iv_opmode == IEEE80211_M_STA)) {
/* read statistic counters (clear on read) and update AMRR state */ /* read statistic counters (clear on read) and update AMRR state */
@ -2733,7 +2737,10 @@ run_newassoc(struct ieee80211_node *ni, int isnew)
rn->mgt_ridx = ridx; rn->mgt_ridx = ridx;
DPRINTF("rate=%d, mgmt_ridx=%d\n", rate, rn->mgt_ridx); DPRINTF("rate=%d, mgmt_ridx=%d\n", rate, rn->mgt_ridx);
usb_callout_reset(&sc->ratectl_ch, hz, run_ratectl_to, sc); RUN_LOCK(sc);
if(sc->ratectl_run != RUN_RATECTL_OFF)
usb_callout_reset(&sc->ratectl_ch, hz, run_ratectl_to, sc);
RUN_UNLOCK(sc);
} }
/* /*