Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3582400ybz; Mon, 20 Apr 2020 05:45:53 -0700 (PDT) X-Google-Smtp-Source: APiQypKRepfjE9QD9ZESkTgN3FXkpHAZdqiepOs/CLPFPG0FHCVekOjdN8UyL7gUm9ZNsrIkVzQA X-Received: by 2002:a05:6402:1596:: with SMTP id c22mr8087737edv.100.1587386753601; Mon, 20 Apr 2020 05:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587386753; cv=none; d=google.com; s=arc-20160816; b=aIYxt35zCm3/BplKXqywZH0aCflSSQCnWq307zi8iCYYhhoybjnkIdIgzppkHiVnU5 /ZE7PGlBh78R/XgMemxzGbbMfNMJQSYvr/1L3XPT6yseQqfSCXYales7dO2cTW6oAvhq TuaAVTMLQ3241XAuvFRGdg8dIvcHOfsfsK2TDPwGkOkvPUU75gWSqI9R9IBGpxeW09dX pO/m+jYUyOX0zLUIz+ae7cGDtTVn+YeTnPFVGEDA9Nd/YrRN+JcdNffipeVz70I0WQAj H/xs8eyGRsY5KgsgtttiZ/GgSlJQmtvxx0Y3ia67c8lDG/EnEuSeTUfXQyEig5e3Ft97 dqfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jZrVqlk/7WEx3TNnfZjy0c5a8BcAL3wSJ4Vc2YAkzT8=; b=yBceZqnYVs6X7XOrJT08CKjEmO2310Dig6crQwQlXaNUJtXNZ0i/Xew4B/wa1ZmXSr 5KWIxZIZTIeiAP9NVl6gzF5Z+Em+ZLxeyhIJB+wHAgH4AkR/qwcTK5QMtOGfVkpyLRy/ MKBzRd/H70bgy4S6DiDBhWjXZ+CIOcyQd705oVlmo/y8mfTlE2DeFikTW/tQ8LmfcYhw ItVUb9HvWKI+vA+IdwTPe2a/4oQAtmcOhU7gu/nebYnc44kGzq2SyeJTAknFQtGMolHH XmMbCTvRspc8drvEspLBkzZIhVH8oJ8pzff2DzgMVoKdKPksAN2CO4YJcM5mxZ7/+LD/ 2gzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OtQX77vI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si454636edm.113.2020.04.20.05.45.30; Mon, 20 Apr 2020 05:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OtQX77vI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726815AbgDTMlu (ORCPT + 99 others); Mon, 20 Apr 2020 08:41:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728068AbgDTMll (ORCPT ); Mon, 20 Apr 2020 08:41:41 -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 09ABF2070B; Mon, 20 Apr 2020 12:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386501; bh=OPmzf2w8oZFjQUcdq4pZIniqTy2a1AU4Sm2JRKbbTW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OtQX77vIGEEPM+IH4Teq9u0aZMWC+8uNA9ECmgGhkOzjjnRQeOJpWqm9CxfRw1Ia/ /VX40yXaooBEuCBHSNIHPcGxncgUvBLb3M3A3cqsdM19balS4IOxOwCwr7X7W3zdKk +Jy2SAtNUU123S1WlH94HE1JVa+6WMg/3l1Vhb58= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg Subject: [PATCH 5.5 49/65] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy Date: Mon, 20 Apr 2020 14:38:53 +0200 Message-Id: <20200420121517.544003407@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -618,10 +618,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),