From patchwork Mon Apr 20 12:39:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227409 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 8F557C3815B for ; Mon, 20 Apr 2020 12:57:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FDA9206E9 for ; Mon, 20 Apr 2020 12:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387435; bh=MdoRFjsV1Lh+ptXgT+zMxl1iZK4FAh48GuDQIzManUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oSMyGrDdWI/2uP9r2WsSWZ1F9R/juMXCCrLn6YyfiAgmF3jwXjsBk10fAj0HR5Qnv PDG3YIj06PcIzx3VCCZtkd7W8//UFFVD9Eg0ahnbKcuwgquHbwNdU9WTVtFN7rQIx7 C5+tPP+EdQ7j03ExxbDcn+o6wfZmPHO/yW/8zTRw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728949AbgDTM5L (ORCPT ); Mon, 20 Apr 2020 08:57:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:38646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728613AbgDTMok (ORCPT ); Mon, 20 Apr 2020 08:44:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 273F5206E9; Mon, 20 Apr 2020 12:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386679; bh=MdoRFjsV1Lh+ptXgT+zMxl1iZK4FAh48GuDQIzManUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XAsdbUOTKzziI/JQjAvQ2gWlZGofav8aBTq1JkMoeL1QAD5uPMOqECU8q5HSCG504 pa7hkeM97VNr/HpwqdByDDFmOacfXGZnI4Lz2Dqiul7q2DxFB0/wwOrPtdcRzhezxL Ye8OEAmPnISAxaoTJxjhlLIGndCYptIB+W+lx7d0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.6 52/71] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy Date: Mon, 20 Apr 2020 14:39:06 +0200 Message-Id: <20200420121519.625075840@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121508.491252919@linuxfoundation.org> References: <20200420121508.491252919@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 0e012b4e4b5ec8e064be3502382579dd0bb43269 upstream. The nested policy here should be established using the NLA_POLICY_NESTED() macro so the length is properly filled in. Cc: stable@vger.kernel.org Fixes: 81e54d08d9d8 ("cfg80211: support FTM responder configuration/statistics") Link: https://lore.kernel.org/r/20200412004029.9d0722bb56c8.Ie690bfcc4a1a61ff8d8ca7e475d59fcaa52fb2da@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/nl80211.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -619,10 +619,8 @@ const struct nla_policy nl80211_policy[N [NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY, .len = NL80211_HE_MAX_CAPABILITY_LEN }, - [NL80211_ATTR_FTM_RESPONDER] = { - .type = NLA_NESTED, - .validation_data = nl80211_ftm_responder_policy, - }, + [NL80211_ATTR_FTM_RESPONDER] = + NLA_POLICY_NESTED(nl80211_ftm_responder_policy), [NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1), [NL80211_ATTR_PEER_MEASUREMENTS] = NLA_POLICY_NESTED(nl80211_pmsr_attr_policy),