diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-09-13 17:08:23 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-09-15 16:45:41 +0200 |
| commit | f1c1f17ac52d22227c0074b3d661d7ed692b707a (patch) | |
| tree | 39a551700fae54fc01846f2e8f093c33eded483c /net/wireless/sme.c | |
| parent | 89b706fb28e431fa7639348536c284fb375eb3c0 (diff) | |
| download | op-kernel-dev-f1c1f17ac52d22227c0074b3d661d7ed692b707a.zip op-kernel-dev-f1c1f17ac52d22227c0074b3d661d7ed692b707a.tar.gz | |
cfg80211: allow connect keys only with default (TX) key
There's no point in allowing connect keys when one of them
isn't also configured as the TX key, it would just confuse
drivers and probably cause them to pick something for TX.
Disallow this confusing and erroneous configuration.
As wpa_supplicant will always send NL80211_ATTR_KEYS, even
when there are no keys inside, allow that and treat it as
though the attribute isn't present at all.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index add6824..c08a3b5 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -1043,6 +1043,9 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, connect->crypto.ciphers_pairwise[0] = cipher; } } + } else { + if (WARN_ON(connkeys)) + return -EINVAL; } wdev->connect_keys = connkeys; |
