]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: cfg80211: handle IBSS in channel switch
authorJohannes Berg <johannes.berg@intel.com>
Mon, 27 Jun 2022 10:36:03 +0000 (12:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 13:16:20 +0000 (15:16 +0200)
commit 77e7b6ba78edf817bddfa97fadb15a971992b1ee upstream.

Prior to commit 7b0a0e3c3a88 ("wifi: cfg80211: do some
rework towards MLO link APIs") the interface type didn't
really matter here, but now we need to handle all of the
possible cases. Add IBSS ("ADHOC") and handle it.

Fixes: 7b0a0e3c3a88 ("wifi: cfg80211: do some rework towards MLO link APIs")
Reported-by: syzbot+90d912872157e63589e4@syzkaller.appspotmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/wireless/nl80211.c

index c4014ee3f667271924fb229c95bad0dd355f5790..d0ba3e646ec6e369a35a116c9e44eccc37fab978 100644 (file)
@@ -18294,6 +18294,9 @@ void cfg80211_ch_switch_notify(struct net_device *dev,
        case NL80211_IFTYPE_P2P_GO:
                wdev->links[link_id].ap.chandef = *chandef;
                break;
+       case NL80211_IFTYPE_ADHOC:
+               wdev->u.ibss.chandef = *chandef;
+               break;
        default:
                WARN_ON(1);
                break;