diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-08 21:26:05 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-08 21:26:05 -0800 |
| commit | c059ef285c7fd4fb0643d3d22d494d49f6c07a76 (patch) | |
| tree | 4e6cf6b5aff939bfa1adf63526f30a4b0b80dfd1 | |
| parent | ff179ae0049a4d2e5f97e4ce5ce2db8fcbce58fa (diff) | |
| parent | cb51fb6ba3931794cff236c42399bc22ec923e15 (diff) | |
Merge "nl80211: Allow SAE Authentication for NL80211_CMD_CONNECT"
| -rw-r--r-- | net/wireless/nl80211.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 093c222e02c0..369829bf7188 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3678,8 +3678,8 @@ static bool nl80211_valid_auth_type(struct cfg80211_registered_device *rdev, return false; return true; case NL80211_CMD_CONNECT: - /* SAE not supported yet */ - if (auth_type == NL80211_AUTHTYPE_SAE) + if (!(rdev->wiphy.features & NL80211_FEATURE_SAE) && + auth_type == NL80211_AUTHTYPE_SAE) return false; /* FILS with SK PFS or PK not supported yet */ if (auth_type == NL80211_AUTHTYPE_FILS_SK_PFS || @@ -8594,6 +8594,7 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) if (nla_get_flag(info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])) { if (!info->attrs[NL80211_ATTR_SOCKET_OWNER]) { + kzfree(connkeys); return -EINVAL; } connect.flags |= CONNECT_REQ_EXTERNAL_AUTH_SUPPORT; |