summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Linville2015-06-23 21:04:03 +0200
committerKalle Valo2015-07-21 15:46:49 +0200
commit8b2c621c9f6f6240edaf4359c3148068fff8b1c7 (patch)
treec4bf39163cf72e7c866dcb7b6723a9733d78551e
parentmwifiex: avoid freeing improper pointer in mwifiex_set_wowlan_mef_entry (diff)
downloadkernel-qcow2-linux-8b2c621c9f6f6240edaf4359c3148068fff8b1c7.tar.gz
kernel-qcow2-linux-8b2c621c9f6f6240edaf4359c3148068fff8b1c7.tar.xz
kernel-qcow2-linux-8b2c621c9f6f6240edaf4359c3148068fff8b1c7.zip
mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies
Without this change, the code simply exits after calling mwifiex_uap_set_head_tail_ies, leving the call to mwifiex_set_mgmt_beacon_data_ies as dead code. Coverity CID #1271292 Signed-off-by: John W. Linville <linville@tuxdriver.com> Acked-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/mwifiex/ie.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c
index 0ba894509413..23e368c77c08 100644
--- a/drivers/net/wireless/mwifiex/ie.c
+++ b/drivers/net/wireless/mwifiex/ie.c
@@ -409,6 +409,8 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
int ret;
ret = mwifiex_uap_parse_tail_ies(priv, info);
+
+ if (ret)
return ret;
return mwifiex_set_mgmt_beacon_data_ies(priv, info);