Skip to contentSkip to conversation

wifi: mac80211: clear vif drv_priv after remove_interface when stopping

PATCH New Felix Fietkau 1 participant 1 message Jul 4, 2024 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
v2: only clear data in ieee80211_do_stop

 net/mac80211/iface.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/mac80211/iface.c +6 -2
index 6d969d9f1ac9..97aee0a1a39a 100644
@@ -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);
Signature · 1 line
2.44.0