evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cfg80211: size various nl80211 messages correctly"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-28 01:44:59 -07:00 • committed by Gerrit - the friendly Code Review server
commit c999d51f5e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/wireless/nl80211.c
View file

@ -12132,7 +12132,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev,
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + len, gfp);
if (!msg) if (!msg)
return; return;
@ -12286,7 +12286,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + req_ie_len + resp_ie_len, gfp);
if (!msg) if (!msg)
return; return;
@ -12331,7 +12331,7 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev,
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + req_ie_len + resp_ie_len, gfp);
if (!msg) if (!msg)
return; return;
@ -12369,7 +12369,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev,
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); msg = nlmsg_new(100 + ie_len, GFP_KERNEL);
if (!msg) if (!msg)
return; return;
@ -12446,7 +12446,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev, const u8 *addr,
trace_cfg80211_notify_new_peer_candidate(dev, addr); trace_cfg80211_notify_new_peer_candidate(dev, addr);
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + ie_len, gfp);
if (!msg) if (!msg)
return; return;
@ -12815,7 +12815,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
struct sk_buff *msg; struct sk_buff *msg;
void *hdr; void *hdr;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + len, gfp);
if (!msg) if (!msg)
return -ENOMEM; return -ENOMEM;
@ -12858,7 +12858,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
trace_cfg80211_mgmt_tx_status(wdev, cookie, ack); trace_cfg80211_mgmt_tx_status(wdev, cookie, ack);
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); msg = nlmsg_new(100 + len, gfp);
if (!msg) if (!msg)
return; return;
@ -13662,7 +13662,7 @@ void cfg80211_ft_event(struct net_device *netdev,
if (!ft_event->target_ap) if (!ft_event->target_ap)
return; return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); msg = nlmsg_new(100 + ft_event->ric_ies_len, GFP_KERNEL);
if (!msg) if (!msg)
return; return;