Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net80211: Merge a memory leak fix from FreeBSD.

Browse Source
This commit is contained in:
Augustin Cavalier 2019-05-16 14:56:44 -04:00
parent 6ee7bb4f7b
commit c5f96e5b4a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.c
View File

@ -662,14 +662,15 @@ ieee80211_crypto_decap(struct ieee80211_node *ni, struct mbuf *m, int hdrlen,
k = &ni->ni_ucastkey;
/*
* Insure crypto header is contiguous for all decap work.
* Insure crypto header is contiguous and long enough for all
* decap work.
*/
cip = k->wk_cipher;
if (m->m_len < hdrlen + cip->ic_header &&
(m = m_pullup(m, hdrlen + cip->ic_header)) == NULL) {
if (m->m_len < hdrlen + cip->ic_header) {
IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2,
"unable to pullup %s header", cip->ic_name);
vap->iv_stats.is_rx_wepfail++; /* XXX */
"frame is too short (%d < %u) for crypto decap",
cip->ic_name, m->m_len, hdrlen + cip->ic_header);
vap->iv_stats.is_rx_tooshort++;
*key = NULL;
return (0);
}