Commit 92ca4f92 authored by Bob Copeland's avatar Bob Copeland Committed by Kalle Valo

mwifiex: fix error handling in mwifiex_create_custom_regdomain

smatch reports:

sta_cmdresp.c:1053 mwifiex_create_custom_regdomain() warn: possible memory leak of 'regd'

Indeed, mwifiex_create_custom_regdomain() returns NULL in the
case that channel is missing in the TLV without freeing regd.

Moreover, some other error paths in this function return ERR_PTR
values which are assigned without checking to the regd field in
the mwifiex_adapter struct.  The latter is only null-checked where
used.

Fix by freeing regd in the error path, and only update
priv->adapter->regd if the returned pointer is valid.

Cc: Amitkumar Karwar <akarwar@marvell.com>
Cc: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f1785fbf
...@@ -1049,8 +1049,10 @@ mwifiex_create_custom_regdomain(struct mwifiex_private *priv, ...@@ -1049,8 +1049,10 @@ mwifiex_create_custom_regdomain(struct mwifiex_private *priv,
enum nl80211_band band; enum nl80211_band band;
chan = *buf++; chan = *buf++;
if (!chan) if (!chan) {
kfree(regd);
return NULL; return NULL;
}
chflags = *buf++; chflags = *buf++;
band = (chan <= 14) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ; band = (chan <= 14) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
freq = ieee80211_channel_to_frequency(chan, band); freq = ieee80211_channel_to_frequency(chan, band);
...@@ -1116,6 +1118,7 @@ static int mwifiex_ret_chan_region_cfg(struct mwifiex_private *priv, ...@@ -1116,6 +1118,7 @@ static int mwifiex_ret_chan_region_cfg(struct mwifiex_private *priv,
u16 action = le16_to_cpu(reg->action); u16 action = le16_to_cpu(reg->action);
u16 tlv, tlv_buf_len, tlv_buf_left; u16 tlv, tlv_buf_len, tlv_buf_left;
struct mwifiex_ie_types_header *head; struct mwifiex_ie_types_header *head;
struct ieee80211_regdomain *regd;
u8 *tlv_buf; u8 *tlv_buf;
if (action != HostCmd_ACT_GEN_GET) if (action != HostCmd_ACT_GEN_GET)
...@@ -1137,10 +1140,10 @@ static int mwifiex_ret_chan_region_cfg(struct mwifiex_private *priv, ...@@ -1137,10 +1140,10 @@ static int mwifiex_ret_chan_region_cfg(struct mwifiex_private *priv,
mwifiex_dbg_dump(priv->adapter, CMD_D, "CHAN:", mwifiex_dbg_dump(priv->adapter, CMD_D, "CHAN:",
(u8 *)head + sizeof(*head), (u8 *)head + sizeof(*head),
tlv_buf_len); tlv_buf_len);
priv->adapter->regd = regd = mwifiex_create_custom_regdomain(priv,
mwifiex_create_custom_regdomain(priv, (u8 *)head + sizeof(*head), tlv_buf_len);
(u8 *)head + if (!IS_ERR(regd))
sizeof(*head), tlv_buf_len); priv->adapter->regd = regd;
break; break;
} }
......
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