diff mbox series

[5.5,49/65] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy

Message ID	20200420121517.544003407@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=w1qd=6E=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Johannes Berg <johannes.berg@intel.com> 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> 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: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,02/65] hsr: check protocol version in hsr_newlink() [5.5,04/65] net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode [5.5,07/65] net: phy: micrel: use genphy_read_status for KSZ9131 [5.5,10/65] net: tun: record RX queue in skb before do_xdp_generic() [5.5,13/65] net/mlx5: Fix frequent ioread PCI access during recovery [5.5,15/65] net/mlx5e: Fix nest_level for vlan pop action [5.5,17/65] net: icmp6: do not select saddr from iif when route has prefsrc set [5.5,21/65] ovl: fix value of i_ino for lower hardlink corner case [5.5,22/65] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic [5.5,25/65] acpi/nfit: improve bounds checking for func [5.5,27/65] pwm: pca9685: Fix PWM/GPIO inter-operation [5.5,29/65] net/bpfilter: remove superfluous testing message [5.5,30/65] ext4: fix incorrect group count in ext4_fill_super error message [5.5,31/65] ext4: fix incorrect inodes per group in error message [5.5,34/65] clk: at91: usb: use proper usbs_mask [5.5,35/65] ARM: dts: imx7-colibri: fix muxing of usbc_det pin [5.5,38/65] ASoC: Intel: mrfld: fix incorrect check on p->sink [5.5,40/65] ALSA: hda/realtek - Enable the headset mic on Asus FX505DT [5.5,41/65] ALSA: usb-audio: Filter error from connector kctl ops, too [5.5,42/65] ALSA: usb-audio: Dont override ignore_ctl_error value from the map [5.5,44/65] ALSA: usb-audio: Check mapping at creating connector controls, too [5.5,46/65] keys: Fix proc_keys_next to increase position index [5.5,47/65] tracing: Fix the race between registering snapshot event trigger and triggering snaps... [5.5,49/65] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy [5.5,51/65] mac80211_hwsim: Use kstrndup() in place of kasprintf() [5.5,52/65] net/mlx5e: Encapsulate updating netdev queues into a function [5.5,55/65] drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled [5.5,57/65] i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT [5.5,58/65] drm/i915/perf: Do not clear pollin for small user read buffers [5.5,60/65] irqchip/ti-sci-inta: Fix processing of masked irqs [5.5,64/65] scsi: target: fix hang when multiple threads try to destroy the same iscsi session

Commit Message

Greg KH April 20, 2020, 12:38 p.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

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 <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/wireless/nl80211.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff mbox series

Patch

--- 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),