2015-06-23 19:15:17

by John W. Linville

Subject: [PATCH] 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 <[email protected]>
---
drivers/net/wireless/mwifiex/ie.c | 2 ++
1 file changed, 2 insertions(+)

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);
--
2.1.0

2015-06-24 13:07:47

by Amitkumar Karwar

Subject: RE: [PATCH] mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies

Hi John,

> From: John W. Linville [mailto:[email protected]]
> Sent: Wednesday, June 24, 2015 12:34 AM
> To: [email protected]
> Cc: Amitkumar Karwar; Avinash Patil; Kalle Valo; John W. Linville
> Subject: [PATCH] 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 <[email protected]>

Acked-by: Amitkumar Karwar <[email protected]>

Thanks,
Amitkumar

2015-07-21 13:47:14

by Kalle Valo

Subject: Re: 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 <[email protected]>
> Acked-by: Amitkumar Karwar <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo