From patchwork Fri Sep 4 13:30:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 264381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 236F1C2D0A8 for ; Fri, 4 Sep 2020 14:21:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0D18206B7 for ; Fri, 4 Sep 2020 14:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599229301; bh=eqFhAXZbmT26mUEhpjJJVcnWgVNwi5MXc9wL2qtl/7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0crpkosCUqnLFn0iBme3v/JuCQ4PaQ27EzpUGA/d+O3H+QvVS+X1AeGfx0UHGMlw5 JL9d6pHFAZqhH1pgWU6luL/P8dpWeJvqjl1DBIrvpjNoYg8CSBOP34JygMpfcxXinc zuAhJ5FV/2hS0FL0VJlJ3Yxv6gZG3pnn1VzEun+A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730330AbgIDOVi (ORCPT ); Fri, 4 Sep 2020 10:21:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:38082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730416AbgIDNeY (ORCPT ); Fri, 4 Sep 2020 09:34:24 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8242021527; Fri, 4 Sep 2020 13:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599226277; bh=eqFhAXZbmT26mUEhpjJJVcnWgVNwi5MXc9wL2qtl/7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=atuO0HeADBwnfIbz6dpC3LvviHrTT9mRPB7Udi8uuaj1VGRkGkamYUuTgSoZal605 5IQikB9ow2U8EAb/l1k7BeCKA2rDwuj+KzrHfSvKwFbf/u+eI9LW95GSn7QMXorcMC c8KBU1dNmjc5r98EgZa7+ugTsknYL50LVAIriGKc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.8 16/17] nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage Date: Fri, 4 Sep 2020 15:30:15 +0200 Message-Id: <20200904120258.791596514@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200904120257.983551609@linuxfoundation.org> References: <20200904120257.983551609@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg commit fce2ff728f95b8894db14f51c9274dc56c37616f upstream. In nl80211_set_station(), we check NL80211_ATTR_HE_6GHZ_CAPABILITY and then use NL80211_ATTR_HE_CAPABILITY, which is clearly wrong. Fix this to use NL80211_ATTR_HE_6GHZ_CAPABILITY as well. Cc: stable@vger.kernel.org Fixes: 43e64bf301fd ("cfg80211: handle 6 GHz capability of new station") Link: https://lore.kernel.org/r/20200805153516.310cef625955.I0abc04dc8abb2c7c005c88ef8fa2d0e3c9fb95c4@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/nl80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6010,7 +6010,7 @@ static int nl80211_set_station(struct sk if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]) params.he_6ghz_capa = - nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]); + nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]); if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT]) params.airtime_weight =