Commit 904f137d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mwifiex: fix struct member mismatch

Using bss->information_elements and treating
bss->len_beacon_ies as its size is wrong, the
real size is len_information_elements.

Found while I was reviewing the use of this
cfg80211 API (as it is actually potentially
broken due to races.)
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1b4e027e
...@@ -161,8 +161,9 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, ...@@ -161,8 +161,9 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
int ret; int ret;
u8 *beacon_ie; u8 *beacon_ie;
struct mwifiex_bss_priv *bss_priv = (void *)bss->priv; 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); GFP_KERNEL);
if (!beacon_ie) { if (!beacon_ie) {
dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n"); 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, ...@@ -172,7 +173,7 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
memcpy(bss_desc->mac_address, bss->bssid, ETH_ALEN); memcpy(bss_desc->mac_address, bss->bssid, ETH_ALEN);
bss_desc->rssi = bss->signal; bss_desc->rssi = bss->signal;
bss_desc->beacon_buf = beacon_ie; 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->beacon_period = bss->beacon_interval;
bss_desc->cap_info_bitmap = bss->capability; bss_desc->cap_info_bitmap = bss->capability;
bss_desc->bss_band = bss_priv->band; bss_desc->bss_band = bss_priv->band;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment