| From b77a4fa8fd14f520f05f27b338ab426937f61658 Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Sun, 12 Apr 2020 00:40:30 +0200 |
| Subject: [PATCH] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
| index 07f97226f971..79e3e1f8a62c 100644 |
| --- a/net/wireless/nl80211.c |
| +++ b/net/wireless/nl80211.c |
| @@ -602,10 +602,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { |
| [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), |
| -- |
| 2.7.4 |
| |
