Merge "nl80211: nl80211_update_ft_ies to validate NL80211_ATTR_IE"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7aef911..c0bdd8f 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4021,7 +4021,7 @@ static bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info,
        struct nlattr *rate;
        u32 bitrate;
        u16 bitrate_compat;
-       enum nl80211_attrs rate_flg;
+       enum nl80211_rate_info rate_flg;
 
        rate = nla_nest_start(msg, attr);
        if (!rate)
@@ -13808,7 +13808,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;