]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mac80211: Fix kernel panic due to use of txq after free
authorBhagavathi Perumal S <bperumal@codeaurora.org>
Tue, 16 Apr 2019 07:24:40 +0000 (12:54 +0530)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 23 Apr 2019 11:45:30 +0000 (13:45 +0200)
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>
net/mac80211/iface.c

index 4a6ff1482a9ffe4bb775317cfcfff83da982faad..02d2e6f11e936fb54814b909849116de173a91c9 100644 (file)
@@ -1908,6 +1908,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) {