From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 4 Jul 2024 13:09:47 +0000 (+0200)
Subject: wifi: mac80211: clear vif drv_priv after remove_interface when stopping
X-Git-Tag: v6.11-rc1~163^2~49^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=574e609c4e6a0843a9ed53de79e00da8fb3e7437;p=thirdparty%2Fkernel%2Flinux.git

wifi: mac80211: clear vif drv_priv after remove_interface when stopping

Avoid reusing stale driver data when an interface is brought down and up
again. In order to avoid having to duplicate the memset in every single
driver, do it here.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/20240704130947.48609-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6d969d9f1ac99..97aee0a1a39a5 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -689,8 +689,12 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
 
 		fallthrough;
 	default:
-		if (going_down)
-			drv_remove_interface(local, sdata);
+		if (!going_down)
+			break;
+		drv_remove_interface(local, sdata);
+
+		/* Clear private driver data to prevent reuse */
+		memset(sdata->vif.drv_priv, 0, local->hw.vif_data_size);
 	}
 
 	ieee80211_recalc_ps(local);