| author | Bhagavathi Perumal S <bperumal@codeaurora.org> | 2019-04-16 07:24:40 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 16:26:55 (GMT) |
| commit | 72d00b6e9a74534fb5e872eea6c46c77ec8e3746 (patch) | |
| tree | 52d81c54e6ee5c9519588036061fc1c63bf62ead | |
| parent | 5b28db54bf2497a4b77f61d96b8cff553387a798 (diff) | |
| download | common-72d00b6e9a74534fb5e872eea6c46c77ec8e3746.zip common-72d00b6e9a74534fb5e872eea6c46c77ec8e3746.tar.gz common-72d00b6e9a74534fb5e872eea6c46c77ec8e3746.tar.bz2 | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 5768560..ad03331 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1937,6 +1937,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) { |