2013-12-11 18:39:50

by Luciano Coelho

Subject: [PATCH] mac80211: lock sdata in ieee80211_csa_connection_drop_work()

We call ieee80211_ibss_disconnect(), which requires sdata to be
locked, so lock the sdata during ieee80211_csa_connection_drop_work().

Cc: Simon Wunderlich <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
---
net/mac80211/ibss.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index df21e4f..94e5c76 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -753,12 +753,16 @@ static void ieee80211_csa_connection_drop_work(struct work_struct *work)
container_of(work, struct ieee80211_sub_if_data,
u.ibss.csa_connection_drop_work);

+ sdata_lock(sdata);
+
ieee80211_ibss_disconnect(sdata);
synchronize_rcu();
skb_queue_purge(&sdata->skb_queue);

/* trigger a scan to find another IBSS network to join */
ieee80211_queue_work(&sdata->local->hw, &sdata->work);
+
+ sdata_unlock(sdata);
}

static void ieee80211_ibss_csa_mark_radar(struct ieee80211_sub_if_data *sdata)
--
1.8.5.1

2013-12-16 12:39:27

by Johannes Berg

Subject: Re: [PATCH] mac80211: lock sdata in ieee80211_csa_connection_drop_work()

On Wed, 2013-12-11 at 20:39 +0200, Luciano Coelho wrote:
> We call ieee80211_ibss_disconnect(), which requires sdata to be
> locked, so lock the sdata during ieee80211_csa_connection_drop_work().

Applied.

johannes