diff options
| author | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-09-24 14:01:55 +0200 |
|---|---|---|
| committer | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-09-24 14:01:55 +0200 |
| commit | cc9333d7aace5c1de4e81932870b53bb6614dedd (patch) | |
| tree | 835717abb66260b86e6116fe1e1871e1c128bf06 /net/wireless | |
| parent | ded0ac8f40f9561d8ab2f8ef6c9ff8dc435f2b41 (diff) | |
| parent | 70915e25e1cff60c32e79e5b02e9559c1ed7bab2 (diff) | |
Merge tag 'v4.9.128' into 4.9-2.3.x-imx
This is the 4.9.128 stable release
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 146d83785b37..6afac189d20f 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -9481,6 +9481,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) |