diff mbox series

[v2] wifi: mac80211: clear vif drv_priv after remove_interface when stopping

Message ID 20240704130947.48609-1-nbd@nbd.name (mailing list archive)
State New
Delegated to: Johannes Berg
Headers show
Series [v2] wifi: mac80211: clear vif drv_priv after remove_interface when stopping | expand

Commit Message

Felix Fietkau July 4, 2024, 1:09 p.m. UTC
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>
---
v2: only clear data in ieee80211_do_stop

 net/mac80211/iface.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6d969d9f1ac9..97aee0a1a39a 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);