From patchwork Thu Oct 13 17:52:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp413449wrs; Thu, 13 Oct 2022 11:13:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4d0IFKJ9/l5W0HFiGFxAaNO3MRu9LL1Jpa1z/R2x5P/lfYJCF2473eBPv1OvqsSt+aiTTp X-Received: by 2002:a63:8643:0:b0:462:9b02:a0c1 with SMTP id x64-20020a638643000000b004629b02a0c1mr1015289pgd.536.1665684792939; Thu, 13 Oct 2022 11:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684792; cv=none; d=google.com; s=arc-20160816; b=wLwtx/K9Vy5bXZS786SLzm0CLi+dsQoOzX0Xaq65ksBpzTdM/GB1im6Tgsjvyq8dwo slEJ3kQfjz5ailBy6F42mS+IgRC3XVeC6c0fTxlARbrThwm1uuX05gbJMzoapvWc/TR3 TpLh6PXKpyx1m0730Vd64NA1uZXV5FtM6ukzQwKmSCYQu8RTL/PRT3l1UyBq8HfsHeZa ZmPQ7+KZmgSdGQIscsHnK5scp84LS9CiRNWkeWS24ESYaEXEj5o2cnHOK1peoanCYIt+ LBCZIvJ2VK5bJVgSny1B5WYy04PxOKDJCYG8XGdvs73mIipdZfAI9Ba3XCIY3WPYp29i +0VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lJQNPQrJ5vaieCbj75SryoIB52SG9hC1W9CZ+CdUIxY=; b=CDKf0AWwtxbQW3J+HRtrs9OgAq2ggsfeCY5tLiUitBYeR1czm3vukiBf6Dpzdiqxqe wItKM4z771QfVIQtcbqp/J0nNP4WAZHPZOUJLZL48sBFQNz70jLapF6NL1LYHG9bA8Zc cICR+ItgFOK59c6UA6+D7m9Rl8FrcMcSxv5rpTXx0RRKvnPw6zHkdCO6GJoxNbWRbRxX ino6X6tMqlArD/Ebq1SIvcWVNwulo9CfIEx0EhQLuBm0pxkMZp9rE/nmmfFJy3he1GE+ W4PQcRg01P0W5b7zor6e48QecrdET4aielpY0MZ8S0VoLuR5JX4SUXWbvbJKzezIMxB6 RgIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ElG6bgkB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a65434a000000b00462cfc13a30si67485pgq.412.2022.10.13.11.13.00; Thu, 13 Oct 2022 11:13:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ElG6bgkB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231470AbiJMSMI (ORCPT + 99 others); Thu, 13 Oct 2022 14:12:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231646AbiJMSLF (ORCPT ); Thu, 13 Oct 2022 14:11:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07AF18F25F; Thu, 13 Oct 2022 11:08:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9E5C76191F; Thu, 13 Oct 2022 17:57:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B2B4C433C1; Thu, 13 Oct 2022 17:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683832; bh=DyhDNVe3IwYG+kcLRCqI3QWXxiGLavoZuoE/lOfGaeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ElG6bgkBq+N66JYrRsjw4n6SrIeJ3MZI0NT4SobUgBF2LGiPA2jquzLu7qQM2LK93 15yznLCbE7aFgeq9aHEgqVHEdMSbLXtSCg54/8fEMBiTZuu30QkxsX+trOCbqrgrpX quM4cTjvsI92kM/9hkjBTvGpsFzBTs9m/NZ1mj5A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?S=C3=B6nke_Huster?= , Johannes Berg Subject: [PATCH 5.10 50/54] wifi: cfg80211: update hidden BSSes to avoid WARN_ON Date: Thu, 13 Oct 2022 19:52:44 +0200 Message-Id: <20221013175148.544333834@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746597097727613825?= X-GMAIL-MSGID: =?utf-8?q?1746597097727613825?= From: Johannes Berg commit c90b93b5b782891ebfda49d4e5da36632fefd5d1 upstream. When updating beacon elements in a non-transmitted BSS, also update the hidden sub-entries to the same beacon elements, so that a future update through other paths won't trigger a WARN_ON(). The warning is triggered because the beacon elements in the hidden BSSes that are children of the BSS should always be the same as in the parent. Reported-by: Sönke Huster Tested-by: Sönke Huster Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning") Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/scan.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1602,6 +1602,23 @@ struct cfg80211_non_tx_bss { u8 bssid_index; }; +static void cfg80211_update_hidden_bsses(struct cfg80211_internal_bss *known, + const struct cfg80211_bss_ies *new_ies, + const struct cfg80211_bss_ies *old_ies) +{ + struct cfg80211_internal_bss *bss; + + /* Assign beacon IEs to all sub entries */ + list_for_each_entry(bss, &known->hidden_list, hidden_list) { + const struct cfg80211_bss_ies *ies; + + ies = rcu_access_pointer(bss->pub.beacon_ies); + WARN_ON(ies != old_ies); + + rcu_assign_pointer(bss->pub.beacon_ies, new_ies); + } +} + static bool cfg80211_update_known_bss(struct cfg80211_registered_device *rdev, struct cfg80211_internal_bss *known, @@ -1625,7 +1642,6 @@ cfg80211_update_known_bss(struct cfg8021 kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head); } else if (rcu_access_pointer(new->pub.beacon_ies)) { const struct cfg80211_bss_ies *old; - struct cfg80211_internal_bss *bss; if (known->pub.hidden_beacon_bss && !list_empty(&known->hidden_list)) { @@ -1653,16 +1669,7 @@ cfg80211_update_known_bss(struct cfg8021 if (old == rcu_access_pointer(known->pub.ies)) rcu_assign_pointer(known->pub.ies, new->pub.beacon_ies); - /* Assign beacon IEs to all sub entries */ - list_for_each_entry(bss, &known->hidden_list, hidden_list) { - const struct cfg80211_bss_ies *ies; - - ies = rcu_access_pointer(bss->pub.beacon_ies); - WARN_ON(ies != old); - - rcu_assign_pointer(bss->pub.beacon_ies, - new->pub.beacon_ies); - } + cfg80211_update_hidden_bsses(known, new->pub.beacon_ies, old); if (old) kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head); @@ -2309,6 +2316,8 @@ cfg80211_update_notlisted_nontrans(struc } else { old = rcu_access_pointer(nontrans_bss->beacon_ies); rcu_assign_pointer(nontrans_bss->beacon_ies, new_ies); + cfg80211_update_hidden_bsses(bss_from_pub(nontrans_bss), + new_ies, old); rcu_assign_pointer(nontrans_bss->ies, new_ies); if (old) kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head);