diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-10-12 12:34:47 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-10-23 12:25:39 +0200 |
| commit | 74a7c93f45abba538914a65dd2ef2ea7cf7150e2 (patch) | |
| tree | 6584860182cb4c2121080f586f60833eb1313f1b | |
| parent | 9118796dfa67a58d17281e019acab4f651eb8dfa (diff) | |
wifi: mac80211: fix change_address deadlock during unregister
When using e.g. bonding, and doing a sequence such as
# iw wlan0 set type __ap
# ip link add name bond1 type bond
# ip link set wlan0 master bond1
# iw wlan0 interface del
we deadlock, since the wlan0 interface removal will cause
bonding to reset the MAC address of wlan0.
The locking would be somewhat difficult to fix, but since
this only happens during removal, we can simply ignore the
MAC address change at this time.
Reported-by: syzbot+25b3a0b24216651bc2af@syzkaller.appspotmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20231012123447.9f9d7fd1f237.Ic3a5ef4391b670941a69cec5592aefc79d9c2890@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/iface.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 124cc53f6b34..e4e7c0b38cb6 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -298,6 +298,14 @@ static int ieee80211_change_mac(struct net_device *dev, void *addr) struct ieee80211_local *local = sdata->local; int ret; + /* + * This happens during unregistration if there's a bond device + * active (maybe other cases?) and we must get removed from it. + * But we really don't care anymore if it's not registered now. + */ + if (!dev->ieee80211_ptr->registered) + return 0; + wiphy_lock(local->hw.wiphy); ret = _ieee80211_change_mac(sdata, addr); wiphy_unlock(local->hw.wiphy); |