提交 0fcba289 编写于 作者: D David S. Miller

Merge tag 'wireless-drivers-for-davem-2016-11-29' of...

Merge tag 'wireless-drivers-for-davem-2016-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.9

mwifiex

* properly terminate SSIDs so that uninitalised memory is not printed
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
...@@ -2222,8 +2222,9 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, ...@@ -2222,8 +2222,9 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len,
is_scanning_required = 1; is_scanning_required = 1;
} else { } else {
mwifiex_dbg(priv->adapter, MSG, mwifiex_dbg(priv->adapter, MSG,
"info: trying to associate to '%s' bssid %pM\n", "info: trying to associate to '%.*s' bssid %pM\n",
(char *)req_ssid.ssid, bss->bssid); req_ssid.ssid_len, (char *)req_ssid.ssid,
bss->bssid);
memcpy(&priv->cfg_bssid, bss->bssid, ETH_ALEN); memcpy(&priv->cfg_bssid, bss->bssid, ETH_ALEN);
break; break;
} }
...@@ -2283,8 +2284,8 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -2283,8 +2284,8 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
} }
mwifiex_dbg(adapter, INFO, mwifiex_dbg(adapter, INFO,
"info: Trying to associate to %s and bssid %pM\n", "info: Trying to associate to %.*s and bssid %pM\n",
(char *)sme->ssid, sme->bssid); (int)sme->ssid_len, (char *)sme->ssid, sme->bssid);
if (!mwifiex_stop_bg_scan(priv)) if (!mwifiex_stop_bg_scan(priv))
cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy); cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);
...@@ -2417,8 +2418,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, ...@@ -2417,8 +2418,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
} }
mwifiex_dbg(priv->adapter, MSG, mwifiex_dbg(priv->adapter, MSG,
"info: trying to join to %s and bssid %pM\n", "info: trying to join to %.*s and bssid %pM\n",
(char *)params->ssid, params->bssid); params->ssid_len, (char *)params->ssid, params->bssid);
mwifiex_set_ibss_params(priv, params); mwifiex_set_ibss_params(priv, params);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册