Commit e251a882 authored by Ganapathi Bhat's avatar Ganapathi Bhat Committed by Kalle Valo

mwifiex: avoid storing random_mac in private

Application will keep track of whether MAC address randomization
is enabled or not during scan. But at present driver is storing
'random_mac' in mwifiex_private which implies even after scan is
done driver has some reference to the earlier 'scan request'. To
avoid this, make use of 'mac_addr' variable in 'scan_request' to
store 'random_mac'. This structure will be freed by cfg80211 once
scan is done.
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d157bcfa
...@@ -2529,15 +2529,12 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, ...@@ -2529,15 +2529,12 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
priv->scan_request = request; priv->scan_request = request;
if (request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) { if (request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {
ether_addr_copy(priv->random_mac, request->mac_addr);
for (i = 0; i < ETH_ALEN; i++) { for (i = 0; i < ETH_ALEN; i++) {
priv->random_mac[i] &= request->mac_addr_mask[i]; request->mac_addr[i] &= request->mac_addr_mask[i];
priv->random_mac[i] |= get_random_int() & request->mac_addr[i] |=
~(request->mac_addr_mask[i]); get_random_int() & ~(request->mac_addr_mask[i]);
} }
ether_addr_copy(user_scan_cfg->random_mac, priv->random_mac); ether_addr_copy(user_scan_cfg->random_mac, request->mac_addr);
} else {
eth_zero_addr(priv->random_mac);
} }
user_scan_cfg->num_ssids = request->n_ssids; user_scan_cfg->num_ssids = request->n_ssids;
......
...@@ -680,7 +680,6 @@ struct mwifiex_private { ...@@ -680,7 +680,6 @@ struct mwifiex_private {
struct mwifiex_user_scan_chan hidden_chan[MWIFIEX_USER_SCAN_CHAN_MAX]; struct mwifiex_user_scan_chan hidden_chan[MWIFIEX_USER_SCAN_CHAN_MAX];
u8 assoc_resp_ht_param; u8 assoc_resp_ht_param;
bool ht_param_present; bool ht_param_present;
u8 random_mac[ETH_ALEN];
}; };
......
...@@ -1946,7 +1946,8 @@ mwifiex_active_scan_req_for_passive_chan(struct mwifiex_private *priv) ...@@ -1946,7 +1946,8 @@ mwifiex_active_scan_req_for_passive_chan(struct mwifiex_private *priv)
adapter->active_scan_triggered = true; adapter->active_scan_triggered = true;
if (priv->scan_request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) if (priv->scan_request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR)
ether_addr_copy(user_scan_cfg->random_mac, priv->random_mac); ether_addr_copy(user_scan_cfg->random_mac,
priv->scan_request->mac_addr);
user_scan_cfg->num_ssids = priv->scan_request->n_ssids; user_scan_cfg->num_ssids = priv->scan_request->n_ssids;
user_scan_cfg->ssid_list = priv->scan_request->ssids; user_scan_cfg->ssid_list = priv->scan_request->ssids;
......
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