diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-09-18 22:46:36 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-18 22:51:07 +0200 |
| commit | 265698d7e6132a2d41471135534f4f36ad15b09c (patch) | |
| tree | dcf575e252d1108b92cd98ebb0b7e77b304819c9 /net/wireless/nl80211.c | |
| parent | nl80211: check for the required netlink attributes presence (diff) | |
| download | linux-265698d7e6132a2d41471135534f4f36ad15b09c.tar.xz linux-265698d7e6132a2d41471135534f4f36ad15b09c.zip | |
nl80211: fix null-ptr dereference on invalid mesh configuration
If TX rates are specified during mesh join, the channel must
also be specified. Check the channel pointer to avoid a null
pointer dereference if it isn't.
Reported-by: Jouni Malinen <j@w1.fi>
Fixes: 8564e38206de ("cfg80211: add checks for beacon rate, extend to mesh")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/nl80211.c')
| -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 fbd5593e88cb..690874293cfc 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -9987,6 +9987,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) |