diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-03-24 13:09:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-20 12:02:10 +0200 |
| commit | db8d32d6b25fdb75c387daee496b96209d477780 (patch) | |
| tree | 1b10595fb604d3f9392c2dd319a32bb8f07f62ba | |
| parent | c4ca9796e550357206860c46b2bc5b5856a0377d (diff) | |
| download | linux-stable-db8d32d6b25fdb75c387daee496b96209d477780.tar.gz linux-stable-db8d32d6b25fdb75c387daee496b96209d477780.tar.bz2 linux-stable-db8d32d6b25fdb75c387daee496b96209d477780.zip | |
wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta
[ Upstream commit 12b220a6171faf10638ab683a975cadcf1a352d6 ]
Avoid potential data corruption issues caused by uninitialized driver
private data structures.
Reported-by: Brian Coverstone <brian@mainsequence.net>
Fixes: 6a9d1b91f34d ("mac80211: add pre-RCU-sync sta removal driver operation")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20230324120924.38412-3-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 0d5265adf539..4e406cd11573 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -942,7 +942,8 @@ static int __must_check __sta_info_destroy_part1(struct sta_info *sta) list_del_rcu(&sta->list); sta->removed = true; - drv_sta_pre_rcu_remove(local, sta->sdata, sta); + if (sta->uploaded) + drv_sta_pre_rcu_remove(local, sta->sdata, sta); if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && rcu_access_pointer(sdata->u.vlan.sta) == sta) |