mac80211: fix iflist_mtx/mtx locking in radar detection

The scan code creates an iflist_mtx -> mtx locking dependency,
and a few other places, notably radar detection, were creating
the opposite dependency, causing lockdep to complain. As scan
and radar detection are mutually exclusive, the deadlock can't
really happen in practice, but it's still bad form.

A similar issue exists in the monitor mode code, but this is
only used by channel-context drivers right now and those have
to have hardware scan, so that also can't happen.

Still, fix these issues by making some of the channel context
code require the mtx to be held rather than acquiring it, thus
allowing the monitor/radar callers to keep the iflist_mtx->mtx
lock ordering.

While at it, also fix access to the local->scanning variable
in the radar code, and document that radar_detect_enabled is
now properly protected by the mtx.

All this would now introduce an ABBA deadlock between the DFS
work cancelling and local->mtx, so change the locking there a
bit to not need to use cancel_delayed_work_sync() but be able
to just use cancel_delayed_work(). The work is also safely
stopped/removed when the interface is stopped, so no extra
changes are needed.

Reported-by: Kalle Valo <kvalo@qca.qualcomm.com>
Tested-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index f20a98a70cc0..f43613a97dd6 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -232,8 +232,8 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
         if (!local->use_chanctx)
                 local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
 
-        /* acquire mutex to prevent idle from changing */
-        mutex_lock(&local->mtx);
+        /* we hold the mutex to prevent idle from changing */
+        lockdep_assert_held(&local->mtx);
         /* turn idle off *before* setting channel -- some drivers need that */
         changed = ieee80211_idle_off(local);
         if (changed)
@@ -246,19 +246,14 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
                 err = drv_add_chanctx(local, ctx);
                 if (err) {
                         kfree(ctx);
-                        ctx = ERR_PTR(err);
-
                         ieee80211_recalc_idle(local);
-                        goto out;
+                        return ERR_PTR(err);
                 }
         }
 
         /* and keep the mutex held until the new chanctx is on the list */
         list_add_rcu(&ctx->list, &local->chanctx_list);
 
- out:
-        mutex_unlock(&local->mtx);
-
         return ctx;
 }
 
@@ -294,9 +289,7 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
         /* throw a warning if this wasn't the only channel context. */
         WARN_ON(check_single_channel && !list_empty(&local->chanctx_list));
 
-        mutex_lock(&local->mtx);
         ieee80211_recalc_idle(local);
-        mutex_unlock(&local->mtx);
 }
 
 static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
@@ -364,6 +357,8 @@ static void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
         bool radar_enabled;
 
         lockdep_assert_held(&local->chanctx_mtx);
+        /* for setting local->radar_detect_enabled */
+        lockdep_assert_held(&local->mtx);
 
         radar_enabled = ieee80211_is_radar_required(local);
 
@@ -518,6 +513,8 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_chanctx *ctx;
         int ret;
 
+        lockdep_assert_held(&local->mtx);
+
         WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
 
         mutex_lock(&local->chanctx_mtx);
@@ -558,6 +555,8 @@ int ieee80211_vif_change_channel(struct ieee80211_sub_if_data *sdata,
         int ret;
         u32 chanctx_changed = 0;
 
+        lockdep_assert_held(&local->mtx);
+
         /* should never be called if not performing a channel switch. */
         if (WARN_ON(!sdata->vif.csa_active))
                 return -EINVAL;
@@ -655,6 +654,8 @@ void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
 {
         WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));
 
+        lockdep_assert_held(&sdata->local->mtx);
+
         mutex_lock(&sdata->local->chanctx_mtx);
         __ieee80211_vif_release_channel(sdata);
         mutex_unlock(&sdata->local->chanctx_mtx);