From patchwork Sun Oct 16 06:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp906752wrs; Sat, 15 Oct 2022 23:47:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7hihB97gU/IKen8wACngBKW4il1XT4qsCQ7QvW5tXJXRAbQINDepXyi+bL363RaL6HYpXd X-Received: by 2002:a05:6402:51d1:b0:45c:1ba1:b7e7 with SMTP id r17-20020a05640251d100b0045c1ba1b7e7mr4995550edd.57.1665902861772; Sat, 15 Oct 2022 23:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665902861; cv=none; d=google.com; s=arc-20160816; b=uwneS94jHDmZe/JGwCVfEPnxhxN77fahnGvbuvAJCHHN3x07cPGa79ufb222pqn/Br BOUM7o1fGXwmsT9rV/mGe98iGw2fzpTygzpHxyLgoRXMrufduQMQXtcrvtDxorcPGQCJ GHvC4bLIfaKa6saNCN5d74xQW5/bYvZbGwJ9hyrwixSmeYyKMxstY8uRwEnnDLUiUXYf gL+mqTcn/zdk1hEJGA/xFs9d2qbYZF5QBnrBQP2oWSJiIds/NAqjAhHWWI21z6+TySYd noAY1Sa42ORVkakwgfbDAp+zgK8zVGnzr936oBnuObvnow/SpvyboGsih8mDy0XsuD15 sDiA== 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=+hPwnrnHicXd1zxS8U73c8tvnsGMef+Os5VgckMTSQk=; b=Wuqeb/4biwIlW8BoEuLWKrTaqbbr4uVdI4nDsSEw2xYgYqpUpDHUCSU/cv+DgT2seq wpXvEmuuCmu/PW1XhIuUxxzCslp5IjqZ5Yo0DOEkalXYKBfWppmrLenYCgoy9DIzWtJx Sy7FggfKjuoohV0pJTp9yZfFwkWPS2n70DkCajDu6x1xmwg/Wop1y2yGE2Fr0jeexxuK O+ISKuft13OsJIfT1CGk+9KJHklJYjneLn4lFsLu6vka6V7Nrr4vnPtYkoQ8PasF4q9f g9D9+7UJsl1vpdWpE9CX9yjjPcO5zcaGUg3J6vWJ57zldywarpZL4CiEEvrQlrOEbPYQ IKMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Sj8nArqI; 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 n8-20020a05640205c800b004590ae88029si7479035edx.610.2022.10.15.23.47.17; Sat, 15 Oct 2022 23:47:41 -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=Sj8nArqI; 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 S229824AbiJPGqI (ORCPT + 99 others); Sun, 16 Oct 2022 02:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbiJPGqB (ORCPT ); Sun, 16 Oct 2022 02:46:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C173399FF; Sat, 15 Oct 2022 23:45:54 -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 6FB9AB80B72; Sun, 16 Oct 2022 06:45:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0AC6C433C1; Sun, 16 Oct 2022 06:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665902751; bh=NrfyXHsZpZD8Ef+zqhd1NxJ+M4kfoBiBROPTAgZ+V6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sj8nArqID4GJ6uyizgKeKLWXp3ZFt33ezPu9PfZBajRG1sQFAgNbDs1vzD9NGJU5J NNS62U7ix+H+jUnCGJejdirugmNa8r9ULNlAoz8R5vonh8odOU5X2vVuuRWJ231TkJ X2wk8ZQAaPBzAjYwCOxqXd6EJuvr6Sj4P5YQELhw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.4 2/4] mac80211: mlme: find auth challenge directly Date: Sun, 16 Oct 2022 08:46:24 +0200 Message-Id: <20221016064454.404903798@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?1746825758826276073?= X-GMAIL-MSGID: =?utf-8?q?1746825758826276073?= From: Johannes Berg There's no need to parse all elements etc. just to find the authentication challenge - use cfg80211_find_elem() instead. This also allows us to remove WLAN_EID_CHALLENGE handling from the element parsing entirely. Link: https://lore.kernel.org/r/20210920154009.45f9b3a15722.Ice3159ffad03a007d6154cbf1fb3a8c48489e86f@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/ieee80211_i.h | 2 -- net/mac80211/mlme.c | 11 ++++++----- net/mac80211/util.c | 4 ---- 3 files changed, 6 insertions(+), 11 deletions(-) --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1460,7 +1460,6 @@ struct ieee802_11_elems { const u8 *supp_rates; const u8 *ds_params; const struct ieee80211_tim_ie *tim; - const u8 *challenge; const u8 *rsn; const u8 *erp_info; const u8 *ext_supp_rates; @@ -1507,7 +1506,6 @@ struct ieee802_11_elems { u8 ssid_len; u8 supp_rates_len; u8 tim_len; - u8 challenge_len; u8 rsn_len; u8 ext_supp_rates_len; u8 wmm_info_len; --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2829,14 +2829,14 @@ static void ieee80211_auth_challenge(str { struct ieee80211_local *local = sdata->local; struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data; + const struct element *challenge; u8 *pos; - struct ieee802_11_elems elems; u32 tx_flags = 0; pos = mgmt->u.auth.variable; - ieee802_11_parse_elems(pos, len - (pos - (u8 *)mgmt), false, &elems, - mgmt->bssid, auth_data->bss->bssid); - if (!elems.challenge) + challenge = cfg80211_find_elem(WLAN_EID_CHALLENGE, pos, + len - (pos - (u8 *)mgmt)); + if (!challenge) return; auth_data->expected_transaction = 4; drv_mgd_prepare_tx(sdata->local, sdata, 0); @@ -2844,7 +2844,8 @@ static void ieee80211_auth_challenge(str tx_flags = IEEE80211_TX_CTL_REQ_TX_STATUS | IEEE80211_TX_INTFL_MLME_CONN_TX; ieee80211_send_auth(sdata, 3, auth_data->algorithm, 0, - elems.challenge - 2, elems.challenge_len + 2, + (void *)challenge, + challenge->datalen + sizeof(*challenge), auth_data->bss->bssid, auth_data->bss->bssid, auth_data->key, auth_data->key_len, auth_data->key_idx, tx_flags); --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1006,10 +1006,6 @@ _ieee802_11_parse_elems_crc(const u8 *st } else elem_parse_failed = true; break; - case WLAN_EID_CHALLENGE: - elems->challenge = pos; - elems->challenge_len = elen; - break; case WLAN_EID_VENDOR_SPECIFIC: if (elen >= 4 && pos[0] == 0x00 && pos[1] == 0x50 && pos[2] == 0xf2) {