diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-18 22:26:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-18 22:26:49 -0400 |
| commit | 7ac327318e09a53e3df431dfd3f664dac7aba4df (patch) | |
| tree | 92487d063cb1fcc5523682383484bf4613a1f65e /net/mac80211/tx.c | |
| parent | 19cd120319ef5390404a5d9c829c3a7962f184a8 (diff) | |
| parent | 85d5313ed717ad60769491c7c072d23bc0a68e7a (diff) | |
| download | linux-7ac327318e09a53e3df431dfd3f664dac7aba4df.tar.bz2 | |
Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Two more fixes:
* reject aggregation sessions for TSID/TID 8-16 that we
can never use anyway and which could confuse drivers
* check return value of skb_linearize()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index cc8e95554b48..18b285e06bc8 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1515,8 +1515,12 @@ out: spin_unlock_bh(&fq->lock); if (skb && skb_has_frag_list(skb) && - !ieee80211_hw_check(&local->hw, TX_FRAG_LIST)) - skb_linearize(skb); + !ieee80211_hw_check(&local->hw, TX_FRAG_LIST)) { + if (skb_linearize(skb)) { + ieee80211_free_txskb(&local->hw, skb); + return NULL; + } + } return skb; } |