diff options
| author | Bhagavathi Perumal S | 2019-04-16 09:24:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-25 18:23:43 +0200 |
| commit | 9c045d8c97390c44a3bea8c2f53930daf84e8960 (patch) | |
| tree | 1066880d021891f6716bdabe7b8edc8689d01a51 /net/mac80211 | |
| parent | x86: kvm: hyper-v: deal with buggy TLB flush requests from WS2012 (diff) | |
| download | kernel-qcow2-linux-9c045d8c97390c44a3bea8c2f53930daf84e8960.tar.gz kernel-qcow2-linux-9c045d8c97390c44a3bea8c2f53930daf84e8960.tar.xz kernel-qcow2-linux-9c045d8c97390c44a3bea8c2f53930daf84e8960.zip | |
mac80211: Fix kernel panic due to use of txq after free
[ Upstream commit f1267cf3c01b12e0f843fb6a7450a7f0b2efab8a ]
The txq of vif is added to active_txqs list for ATF TXQ scheduling
in the function ieee80211_queue_skb(), but it was not properly removed
before freeing the txq object. It was causing use after free of the txq
objects from the active_txqs list, result was kernel panic
due to invalid memory access.
Fix kernel invalid memory access by properly removing txq object
from active_txqs list before free the object.
Signed-off-by: Bhagavathi Perumal S <bperumal@codeaurora.org>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.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/iface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 3a0171a65db3..152d4365f961 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1910,6 +1910,9 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) list_del_rcu(&sdata->list); mutex_unlock(&sdata->local->iflist_mtx); + if (sdata->vif.txq) + ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq)); + synchronize_rcu(); if (sdata->dev) { |