From patchwork Sun Oct 16 06:46:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp907061wrs; Sat, 15 Oct 2022 23:49:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6w9s0XlGOf8Y8/UbpWtSsWRJU8KRtxWZB5Uh6qZWUVwaadkE3ERbWe/vZ7uOzAmv94zSpx X-Received: by 2002:aa7:c58a:0:b0:459:1511:6cff with SMTP id g10-20020aa7c58a000000b0045915116cffmr5164568edq.27.1665902969634; Sat, 15 Oct 2022 23:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665902969; cv=none; d=google.com; s=arc-20160816; b=GbEn0KRgCU3KFklG96bV459sDQKiF0HNtfYA3FuGCC5QPD/Vb5NBoLKKckkDcAwjxF lc2+khWzo/T+3htmZseh3H448hsBADwvmaf8txDLEDcJrYo51tWFnZk9FddqTAW21dr/ UYlbOxFM0tlp1O9qyZI27zV3C4mrOFxHDXrCvNZ1dmttZP/Mb0xZD88U6wasFESLfAY/ uA9IzjC/a4S0JHfO4TNYe2QSiU7QRQpCpvfTEx8icKRUbuE9n02ONPFdcLZ41fYfbouR 9Nczr/s3A7ZrcpttwhlfD+aM8XFJTHH1osPYgKYa9uvuBC6bXkRbq9de+31Qx2a+V+Zb txuQ== 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=LJ6znEr2mQQvBYS393KmG3Muet9ZoVxi+MweAndiCQM=; b=KgNVLxmn+QZviD84UkyNHAHPztGu2BnO4YH+qoLCm7VQwP2E+5GkwdR3QaCpt7b8p9 J/lZAkHrsDv4FptRkscu6AEk987q/lBcX/Fv21lbEX9SLQngLwaWuN9oasvpke8qjOOY wb2FU1KxhXV3I7uQEZHkea7uphQDeCqYttpkyY0Ti3XUwVuqkuI3n9dAYZQEgBe3DpnL J8hc/eW68xI0n/oyHRgQsSKq04T0pOOn0PHfH1GuSzd4sUYzBd1XuHdiH+XQYcMiLkyn 9lYrnCnnwjfJGUxkBDuOw236diAeKK0RDoa+sSeIvbFN0q74pg4ejJ3d/ExeRxhQfYKd Roxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TrBWzdii; 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 j27-20020a170906279b00b0078e0324ee54si5144223ejc.490.2022.10.15.23.49.03; Sat, 15 Oct 2022 23:49:29 -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=TrBWzdii; 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 S229830AbiJPGqO (ORCPT + 99 others); Sun, 16 Oct 2022 02:46:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbiJPGqD (ORCPT ); Sun, 16 Oct 2022 02:46:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 396CC3AE5B; Sat, 15 Oct 2022 23:45:56 -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 ams.source.kernel.org (Postfix) with ESMTPS id 25C52B80B77; Sun, 16 Oct 2022 06:45:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85BE2C433D7; Sun, 16 Oct 2022 06:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665902753; bh=OPUq4AaBA6cqzgAQsUxgbbuBNbAZzLY8pUyPprPooYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TrBWzdiiQogsYpzs5qRmXDMkEkcP0kEivjac3mPKa0gWoqch8OHf+wEk1wTgYWU3H 8LzYPICFHnfKcNBF1hoYB/p4XD5EO0eBwedAuZESJ4XnujQbLx5l4y69opLVi63VDA ocCHf6Eb+taj7IAgSbmGzYoNwRHQTNjdXIwk+4yQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.4 3/4] wifi: mac80211: dont parse mbssid in assoc response Date: Sun, 16 Oct 2022 08:46:25 +0200 Message-Id: <20221016064454.438611868@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016064454.327821011@linuxfoundation.org> References: <20221016064454.327821011@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?1746825872498557605?= X-GMAIL-MSGID: =?utf-8?q?1746825872498557605?= From: Johannes Berg This is simply not valid and simplifies the next commit. I'll make a separate patch for this in the current main tree as well. Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3224,7 +3224,7 @@ static bool ieee80211_assoc_success(stru pos = mgmt->u.assoc_resp.variable; ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems, - mgmt->bssid, assoc_data->bss->bssid); + mgmt->bssid, NULL); if (!elems.supp_rates) { sdata_info(sdata, "no SuppRates element in AssocResp\n"); @@ -3576,7 +3576,7 @@ static void ieee80211_rx_mgmt_assoc_resp pos = mgmt->u.assoc_resp.variable; ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems, - mgmt->bssid, assoc_data->bss->bssid); + mgmt->bssid, NULL); if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY && elems.timeout_int &&