Commit d7a2c259 authored by Brian Norris's avatar Brian Norris Committed by Greg Kroah-Hartman

mwifiex: printk() overflow with 32-byte SSIDs

commit fcd2042e upstream.

SSIDs aren't guaranteed to be 0-terminated. Let's cap the max length
when we print them out.

This can be easily noticed by connecting to a network with a 32-octet
SSID:

[ 3903.502925] mwifiex_pcie 0000:01:00.0: info: trying to associate to
'0123456789abcdef0123456789abcdef <uninitialized mem>' bssid
xx:xx:xx:xx:xx:xx

Fixes: 5e6e3a92 ("wireless: mwifiex: initial commit for Marvell mwifiex driver")
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Acked-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac6e42d7
...@@ -2144,8 +2144,9 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, ...@@ -2144,8 +2144,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;
} }
...@@ -2202,8 +2203,8 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -2202,8 +2203,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);
ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid, ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
priv->bss_mode, sme->channel, sme, 0); priv->bss_mode, sme->channel, sme, 0);
...@@ -2333,8 +2334,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, ...@@ -2333,8 +2334,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%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment