From: Felix Fietkau Date: Fri, 24 Mar 2023 12:09:24 +0000 (+0100) Subject: wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta X-Git-Tag: baikal/aarch64/sdk6.2~1655 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=107468beef2284509f5334b216bd9d7e6144c35d;p=kernel.git 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 Fixes: dd174a1c1622 ("mac80211: add pre-RCU-sync sta removal driver operation") Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20230324120924.38412-3-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 3603cbc167570..30efa26f977f6 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1242,7 +1242,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)