diff mbox series

[net] mac80211: fix locking in ieee80211_start_ap error path

Message ID 20211220092240.12768-1-johannes@sipsolutions.net (mailing list archive)
State Accepted
Commit 87a270625a89fc841f1a7e21aae6176543d8385c
Delegated to: Netdev Maintainers
Headers show
Series [net] mac80211: fix locking in ieee80211_start_ap error path | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/apply success Patch already applied to net

Commit Message

Johannes Berg Dec. 20, 2021, 9:22 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

We need to hold the local->mtx to release the channel context,
as even encoded by the lockdep_assert_held() there. Fix it.

Cc: stable@vger.kernel.org
Fixes: 295b02c4be74 ("mac80211: Add FILS discovery support")
Reported-and-tested-by: syzbot+11c342e5e30e9539cabd@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/20211220090836.cee3d59a1915.I36bba9b79dc2ff4d57c3c7aa30dff9a003fe8c5c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
Jakub/Dave, could you please apply this directly? I have no
other things pending for net at the moment. Thanks!
---
 net/mac80211/cfg.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 20, 2021, 11:40 a.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:

On Mon, 20 Dec 2021 10:22:40 +0100 you wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> We need to hold the local->mtx to release the channel context,
> as even encoded by the lockdep_assert_held() there. Fix it.
> 
> Cc: stable@vger.kernel.org
> Fixes: 295b02c4be74 ("mac80211: Add FILS discovery support")
> Reported-and-tested-by: syzbot+11c342e5e30e9539cabd@syzkaller.appspotmail.com
> Link: https://lore.kernel.org/r/20211220090836.cee3d59a1915.I36bba9b79dc2ff4d57c3c7aa30dff9a003fe8c5c@changeid
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> 
> [...]

Here is the summary with links:
  - [net] mac80211: fix locking in ieee80211_start_ap error path
    https://git.kernel.org/netdev/net/c/87a270625a89

You are awesome, thank you!
diff mbox series

Patch

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index bd3d3195097f..2d0dd69f9753 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1264,7 +1264,10 @@  static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
 	return 0;
 
 error:
+	mutex_lock(&local->mtx);
 	ieee80211_vif_release_channel(sdata);
+	mutex_unlock(&local->mtx);
+
 	return err;
 }