diff options
| author | Sara Sharon | 2018-12-15 10:03:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-13 09:51:02 +0100 |
| commit | ff014712e5d3b5de40514118846e8fa260a788a2 (patch) | |
| tree | cd42c29ee2476a8e9ff1a282f55cca66c6928c00 /net/mac80211 | |
| parent | nl80211: fix memory leak if validate_pae_over_nl80211() fails (diff) | |
| download | kernel-qcow2-linux-ff014712e5d3b5de40514118846e8fa260a788a2.tar.gz kernel-qcow2-linux-ff014712e5d3b5de40514118846e8fa260a788a2.tar.xz kernel-qcow2-linux-ff014712e5d3b5de40514118846e8fa260a788a2.zip | |
mac80211: free skb fraglist before freeing the skb
[ Upstream commit 34b1e0e9efe101822e83cc62d22443ed3867ae7a ]
mac80211 uses the frag list to build AMSDU. When freeing
the skb, it may not be really freed, since someone is still
holding a reference to it.
In that case, when TCP skb is being retransmitted, the
pointer to the frag list is being reused, while the data
in there is no longer valid.
Since we will never get frag list from the network stack,
as mac80211 doesn't advertise the capability, we can safely
free and nullify it before releasing the SKB.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/status.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 7fa10d06cc51..534a604b75c2 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -556,6 +556,11 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local, } ieee80211_led_tx(local); + + if (skb_has_frag_list(skb)) { + kfree_skb_list(skb_shinfo(skb)->frag_list); + skb_shinfo(skb)->frag_list = NULL; + } } /* |