diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:32 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:55 +0200 |
| commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
| tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /net/wireless | |
| parent | 503c1fb98ba3859c13863957c7c65c92371a9e50 (diff) | |
| parent | cc71b7b071192ac1c288e272fdc3f3877eb96663 (diff) | |
| download | linux-753d179ad001b25425beb977d00f2531540e7d42.tar.gz linux-753d179ad001b25425beb977d00f2531540e7d42.tar.bz2 linux-753d179ad001b25425beb977d00f2531540e7d42.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 90e212db6889..5129342151e6 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -10021,6 +10021,9 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info) if (err) return err; + if (!setup.chandef.chan) + return -EINVAL; + err = validate_beacon_tx_rate(rdev, setup.chandef.chan->band, &setup.beacon_rate); if (err) @@ -10937,6 +10940,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info) if (err) return err; + if (!tb[NL80211_REKEY_DATA_REPLAY_CTR] || !tb[NL80211_REKEY_DATA_KEK] || + !tb[NL80211_REKEY_DATA_KCK]) + return -EINVAL; if (nla_len(tb[NL80211_REKEY_DATA_REPLAY_CTR]) != NL80211_REPLAY_CTR_LEN) return -ERANGE; if (nla_len(tb[NL80211_REKEY_DATA_KEK]) != NL80211_KEK_LEN) |