diff options
| author | avos <avos@FreeBSD.org> | 2017-02-24 21:19:40 +0000 |
|---|---|---|
| committer | avos <avos@FreeBSD.org> | 2017-02-24 21:19:40 +0000 |
| commit | fe5ebb6120b1cda239d0a16eea656611dc08059b (patch) | |
| tree | 93d6cde68a4375e91dff945c6930912fafa18974 | |
| parent | 74a66f079644cde61566b4fd3178ea09231abe4a (diff) | |
| download | FreeBSD-src-fe5ebb6120b1cda239d0a16eea656611dc08059b.zip FreeBSD-src-fe5ebb6120b1cda239d0a16eea656611dc08059b.tar.gz | |
MFC r313906:
iwi, ral, zyd: fix possible use-after-free.
| -rw-r--r-- | sys/dev/iwi/if_iwi.c | 2 | ||||
| -rw-r--r-- | sys/dev/ral/rt2661.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zyd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index f1116f6..8e049e3 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -1979,9 +1979,9 @@ iwi_start(struct iwi_softc *sc) } ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; if (iwi_tx_start(sc, m, ni, ac) != 0) { - ieee80211_free_node(ni); if_inc_counter(ni->ni_vap->iv_ifp, IFCOUNTER_OERRORS, 1); + ieee80211_free_node(ni); break; } sc->sc_tx_timer = 5; diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c index 8d51fd8..5f105f6 100644 --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -1619,9 +1619,9 @@ rt2661_start(struct rt2661_softc *sc) } ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; if (rt2661_tx_data(sc, m, ni, ac) != 0) { - ieee80211_free_node(ni); if_inc_counter(ni->ni_vap->iv_ifp, IFCOUNTER_OERRORS, 1); + ieee80211_free_node(ni); break; } sc->sc_tx_timer = 5; diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 01afe1b..76f8f42 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -2570,10 +2570,10 @@ zyd_start(struct zyd_softc *sc) while (sc->tx_nfree > 0 && (m = mbufq_dequeue(&sc->sc_snd)) != NULL) { ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; if (zyd_tx_start(sc, m, ni) != 0) { - ieee80211_free_node(ni); m_freem(m); if_inc_counter(ni->ni_vap->iv_ifp, IFCOUNTER_OERRORS, 1); + ieee80211_free_node(ni); break; } } |
