summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-06-15 10:28:13 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-06-15 10:28:13 -0700
commit69f3e88c6c1379b8f12dd5bee7310c60a17ed61a (patch)
tree99c2c13437c4b04c7f2b43a458932e807f6b0611
parent4fb9f9a7b7ac9066f8a7d27968f9f09f0f08e297 (diff)
parentdf55603b24bc48fd765332d71a9ca1f82c1e8e39 (diff)
Merge "nl80211: fix nlmsg allocation in cfg80211_ft_event"
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f08ed375bb91..4490dec28f50 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -13807,7 +13807,8 @@ void cfg80211_ft_event(struct net_device *netdev,
if (!ft_event->target_ap)
return;
- msg = nlmsg_new(100 + ft_event->ric_ies_len, GFP_KERNEL);
+ msg = nlmsg_new(100 + ft_event->ies_len + ft_event->ric_ies_len,
+ GFP_KERNEL);
if (!msg)
return;