From 2d6fe8424288a73041a2722ec2ff78000e720479 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 28 Nov 2012 21:53:45 +0100 Subject: [PATCH] --- yaml --- r: 341937 b: refs/heads/master c: 904f137d478215b7c5c1daabae03618ed2f703cf h: refs/heads/master i: 341935: ebe9b0fed21b554e41d64d331a5a5b92eca9533c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/sta_ioctl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 093c63004701..0bf1356dc8af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b4e027e1b1176b70a59665c0de58c04c7a4e210 +refs/heads/master: 904f137d478215b7c5c1daabae03618ed2f703cf diff --git a/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c b/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c index 237c8d2ba9f2..cf8918c044bb 100644 --- a/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/trunk/drivers/net/wireless/mwifiex/sta_ioctl.c @@ -161,8 +161,9 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, int ret; u8 *beacon_ie; struct mwifiex_bss_priv *bss_priv = (void *)bss->priv; + size_t beacon_ie_len = bss->len_information_elements; - beacon_ie = kmemdup(bss->information_elements, bss->len_beacon_ies, + beacon_ie = kmemdup(bss->information_elements, beacon_ie_len, GFP_KERNEL); if (!beacon_ie) { dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n"); @@ -172,7 +173,7 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, memcpy(bss_desc->mac_address, bss->bssid, ETH_ALEN); bss_desc->rssi = bss->signal; bss_desc->beacon_buf = beacon_ie; - bss_desc->beacon_buf_size = bss->len_beacon_ies; + bss_desc->beacon_buf_size = beacon_ie_len; bss_desc->beacon_period = bss->beacon_interval; bss_desc->cap_info_bitmap = bss->capability; bss_desc->bss_band = bss_priv->band;