aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhagavathi Perumal S <bperumal@codeaurora.org>2019-04-16 12:54:40 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 18:23:43 +0200
commit9c045d8c97390c44a3bea8c2f53930daf84e8960 (patch)
tree1066880d021891f6716bdabe7b8edc8689d01a51
parenta0a49d8712de474404381f94b0b54f72fa0db0fb (diff)
downloadlinux-yocto-9c045d8c97390c44a3bea8c2f53930daf84e8960.tar.gz
linux-yocto-9c045d8c97390c44a3bea8c2f53930daf84e8960.tar.bz2
linux-yocto-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>
-rw-r--r--net/mac80211/iface.c3
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) {