diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2021-12-20 10:22:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-20 11:33:23 +0000 |
| commit | 87a270625a89fc841f1a7e21aae6176543d8385c (patch) | |
| tree | 07efc2f9615a937bf92fc9d5bd4e2fe80c64f7d3 /net | |
| parent | 60ec7fcfe76892a1479afab51ff17a4281923156 (diff) | |
| download | linux-stable-87a270625a89fc841f1a7e21aae6176543d8385c.tar.gz linux-stable-87a270625a89fc841f1a7e21aae6176543d8385c.tar.bz2 linux-stable-87a270625a89fc841f1a7e21aae6176543d8385c.zip | |
mac80211: fix locking in ieee80211_start_ap error path
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; } |