aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-05-11 14:57:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-13 15:44:33 -0400
commit0e46724a48fcc3bac1fecea413d20af64a75844f (patch)
treede07f6d714e7dc2cae05df5a1f69c3aa0fb46397
parent08645126dd24872c2e27014f93968f7312e29176 (diff)
nl80211: Validate MFP flag type when parsing STA flags
NL80211_STA_FLAG_MFP was forgotten from sta_flags_policy. The previous version added the flag due to the loop used in parse_station_flags, but the proper behavior would be to allow nla_parse_nested() to go through the policy for all flags. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/wireless/nl80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f88dbbec7521..2353ddbf4934 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1331,6 +1331,7 @@ static const struct nla_policy sta_flags_policy[NL80211_STA_FLAG_MAX + 1] = {
1331 [NL80211_STA_FLAG_AUTHORIZED] = { .type = NLA_FLAG }, 1331 [NL80211_STA_FLAG_AUTHORIZED] = { .type = NLA_FLAG },
1332 [NL80211_STA_FLAG_SHORT_PREAMBLE] = { .type = NLA_FLAG }, 1332 [NL80211_STA_FLAG_SHORT_PREAMBLE] = { .type = NLA_FLAG },
1333 [NL80211_STA_FLAG_WME] = { .type = NLA_FLAG }, 1333 [NL80211_STA_FLAG_WME] = { .type = NLA_FLAG },
1334 [NL80211_STA_FLAG_MFP] = { .type = NLA_FLAG },
1334}; 1335};
1335 1336
1336static int parse_station_flags(struct nlattr *nla, u32 *staflags) 1337static int parse_station_flags(struct nlattr *nla, u32 *staflags)