diff options
author | Johannes Berg <johannes.berg@intel.com> | 2016-09-14 03:55:57 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-09-15 10:46:17 -0400 |
commit | 76e1fb4b5532a9df9eb14cfe002412c7617c4ad0 (patch) | |
tree | ab1f7c13aa42ae797597020d2888abe107542b67 /net/wireless/nl80211.c | |
parent | 58bd7f1158ac7543ccdcddc7f4ecd7db458e6d0b (diff) |
nl80211: always check nla_nest_start() return value
If the message got full during nla_nest_start(), it can return
NULL. None of the cases here seem like that can really happen,
but check the return value nonetheless.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index f2a77c3daa59..60c8a7429d33 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -8022,6 +8022,8 @@ __cfg80211_alloc_vendor_skb(struct cfg80211_registered_device *rdev, | |||
8022 | } | 8022 | } |
8023 | 8023 | ||
8024 | data = nla_nest_start(skb, attr); | 8024 | data = nla_nest_start(skb, attr); |
8025 | if (!data) | ||
8026 | goto nla_put_failure; | ||
8025 | 8027 | ||
8026 | ((void **)skb->cb)[0] = rdev; | 8028 | ((void **)skb->cb)[0] = rdev; |
8027 | ((void **)skb->cb)[1] = hdr; | 8029 | ((void **)skb->cb)[1] = hdr; |
@@ -9458,8 +9460,14 @@ static int nl80211_send_wowlan_nd(struct sk_buff *msg, | |||
9458 | 9460 | ||
9459 | if (req->n_match_sets) { | 9461 | if (req->n_match_sets) { |
9460 | matches = nla_nest_start(msg, NL80211_ATTR_SCHED_SCAN_MATCH); | 9462 | matches = nla_nest_start(msg, NL80211_ATTR_SCHED_SCAN_MATCH); |
9463 | if (!matches) | ||
9464 | return -ENOBUFS; | ||
9465 | |||
9461 | for (i = 0; i < req->n_match_sets; i++) { | 9466 | for (i = 0; i < req->n_match_sets; i++) { |
9462 | match = nla_nest_start(msg, i); | 9467 | match = nla_nest_start(msg, i); |
9468 | if (!match) | ||
9469 | return -ENOBUFS; | ||
9470 | |||
9463 | nla_put(msg, NL80211_SCHED_SCAN_MATCH_ATTR_SSID, | 9471 | nla_put(msg, NL80211_SCHED_SCAN_MATCH_ATTR_SSID, |
9464 | req->match_sets[i].ssid.ssid_len, | 9472 | req->match_sets[i].ssid.ssid_len, |
9465 | req->match_sets[i].ssid.ssid); | 9473 | req->match_sets[i].ssid.ssid); |
@@ -9474,6 +9482,9 @@ static int nl80211_send_wowlan_nd(struct sk_buff *msg, | |||
9474 | 9482 | ||
9475 | for (i = 0; i < req->n_scan_plans; i++) { | 9483 | for (i = 0; i < req->n_scan_plans; i++) { |
9476 | scan_plan = nla_nest_start(msg, i + 1); | 9484 | scan_plan = nla_nest_start(msg, i + 1); |
9485 | if (!scan_plan) | ||
9486 | return -ENOBUFS; | ||
9487 | |||
9477 | if (!scan_plan || | 9488 | if (!scan_plan || |
9478 | nla_put_u32(msg, NL80211_SCHED_SCAN_PLAN_INTERVAL, | 9489 | nla_put_u32(msg, NL80211_SCHED_SCAN_PLAN_INTERVAL, |
9479 | req->scan_plans[i].interval) || | 9490 | req->scan_plans[i].interval) || |