]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: remove debugfs dir for virtual monitor
authorAlexander Wetzel <Alexander@wetzel-home.de>
Tue, 4 Feb 2025 16:42:40 +0000 (17:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:28 +0000 (14:39 +0200)
[ Upstream commit 646262c71aca87bb66945933abe4e620796d6c5a ]

Don't call ieee80211_debugfs_recreate_netdev() for virtual monitor
interface when deleting it.

The virtual monitor interface shouldn't have debugfs entries and trying
to update them will *create* them on deletion.

And when the virtual monitor interface is created/destroyed multiple
times we'll get warnings about debugfs name conflicts.

Signed-off-by: Alexander Wetzel <Alexander@wetzel-home.de>
Link: https://patch.msgid.link/20250204164240.370153-1-Alexander@wetzel-home.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/driver-ops.c
net/mac80211/iface.c

index fe868b5216220109f21310cf632709cba5e3cc97..9b7d099948207dcc7fda7700c1f00625bd31e96e 100644 (file)
@@ -115,8 +115,14 @@ void drv_remove_interface(struct ieee80211_local *local,
 
        sdata->flags &= ~IEEE80211_SDATA_IN_DRIVER;
 
-       /* Remove driver debugfs entries */
-       ieee80211_debugfs_recreate_netdev(sdata, sdata->vif.valid_links);
+       /*
+        * Remove driver debugfs entries.
+        * The virtual monitor interface doesn't get a debugfs
+        * entry, so it's exempt here.
+        */
+       if (sdata != local->monitor_sdata)
+               ieee80211_debugfs_recreate_netdev(sdata,
+                                                 sdata->vif.valid_links);
 
        trace_drv_remove_interface(local, sdata);
        local->ops->remove_interface(&local->hw, &sdata->vif);
index af9055252e6dfa8d6d3278e5d22532cc0a82a8b9..8bbfa45e1796df8d9ad40ae52091b4db2f3a8299 100644 (file)
@@ -1205,16 +1205,17 @@ void ieee80211_del_virtual_monitor(struct ieee80211_local *local)
                return;
        }
 
-       RCU_INIT_POINTER(local->monitor_sdata, NULL);
-       mutex_unlock(&local->iflist_mtx);
-
-       synchronize_net();
-
+       clear_bit(SDATA_STATE_RUNNING, &sdata->state);
        ieee80211_link_release_channel(&sdata->deflink);
 
        if (ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF))
                drv_remove_interface(local, sdata);
 
+       RCU_INIT_POINTER(local->monitor_sdata, NULL);
+       mutex_unlock(&local->iflist_mtx);
+
+       synchronize_net();
+
        kfree(sdata);
 }