From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21F424F7CDC; Wed, 30 Sep 2026 16:29:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785774; cv=none; b=FGneOIxHdhqY2NiDG61aUOTWYewg6B7hY+TcF+7s6ePQAoRWbZdhmO1fNXHkl+CWtdcynWxDAik+bgaDq09AqcL/duvC5LTM8sK4ud+bx9HZg4dR6JKqbFxWJOKyKPxTgK72ND8HGUVaKqafbECjf1sV+p1i198/elVT1hRSHW0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790785774; c=relaxed/simple; bh=J5O2sjhi+QORZhXbKcNFxuhKnpO395EElkLH3fvEH7g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lGzGPpqKXGNQdH+D+ZAeEnT9rrHz7qw84hYwln+jsgzy7ak6brS0JYhr/AdgXSkQowFqfIj6WJSp0ioKav1eoPknBf7NI/cdWNismoZBGjfDvRdYY6mdoL6jKoxS9J5cO7eEwNzKFgr8EpS0hWRPacK8aUh2RWeYQOCtKW/TwR8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=REoDYK2N; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="REoDYK2N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7ABDF1F000FF; Wed, 30 Sep 2026 16:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790785773; bh=ZFFAm6k/QTA2BVkDHtKZ0AFSHfW7KkD3x93JEaofc7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=REoDYK2N50T3Z2plKM9+P6FsJWaGpoq8rRPfadFxgdu9Kg/gh2qtd9/QVeHyzCU7M 2EkRhnTIVY2t+f+NfYJ7EIcpT+fqjw/Na48KB2FWJOV9t+e65NwCFy2+eU/mV/Zzb1 z9Om7kz6SLE/q135aVJmo4Iju/9VljqTL0V91aaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+dc6f4dce0d707900cdea@syzkaller.appspotmail.com, Johannes Berg , Sasha Levin Subject: [PATCH 6.1 626/982] wifi: cfg80211: dont filter by BSS type when removing stale entries Date: Wed, 30 Sep 2026 17:22:42 +0200 Message-ID: <20260930152430.219354690@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit b377e1000d963e7182a987082b4b06580bd7ac84 ] When an assoc AP switches to a channel that already has a BSS entry, cfg80211_update_assoc_bss_entry() removes that entry before rehashing the real one, since the two would otherwise collide in the BSS rbtree. The lookup for that entry also required it to match the connection's BSS type, so an entry advertising e.g. the IBSS capability bit was left in place, and the following cfg80211_rehash_bss() then ran into it: WARN_ON(!cmp) Changing the type shouldn't really happen, but can be triggered by a rogue AP/device, so drop the check and remove any entries matching the comparison. Assisted-by: LLM Fixes: 0afd425b1b64 ("cfg80211: fix duplicated scan entries after channel switch") Reported-by: syzbot+dc6f4dce0d707900cdea@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=dc6f4dce0d707900cdea Link: https://patch.msgid.link/20260904165614.1f05dae1c546.Ib52d57b57caa912efee020f9d4a033a5160617ce@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/scan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 829b78eba6b10..ecf9021219380 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2684,11 +2684,6 @@ void cfg80211_update_assoc_bss_entry(struct wireless_dev *wdev, cbss->pub.channel = chan; list_for_each_entry(bss, &rdev->bss_list, list) { - if (!cfg80211_bss_type_match(bss->pub.capability, - bss->pub.channel->band, - wdev->conn_bss_type)) - continue; - if (bss == cbss) continue; -- 2.53.0