From: Pavel Machek <pavel@ucw.cz>
To: Colin King <colin.king@canonical.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
Cong Wang <xiyou.wangcong@gmail.com>,
Johannes Berg <johannes.berg@intel.com>,
"David S . Miller" <davem@davemloft.net>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] wl1251: check return from call to wl1251_acx_arp_ip_filter
Date: Tue, 26 Dec 2017 18:17:33 +0000 [thread overview]
Message-ID: <20171226181733.GA20068@amd> (raw)
In-Reply-To: <20171226173318.5076-1-colin.king@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
On Tue 2017-12-26 17:33:18, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the less than zero error check on ret is incorrect
> as it is checking a far earlier ret assignment rather than the
> return from the call to wl1251_acx_arp_ip_filter. Fix this by
> adding in the missing assginment.
>
> Detected by CoverityScan, CID#1164835 ("Logically dead code")
>
> Fixes: 204cc5c44fb6 ("wl1251: implement hardware ARP filtering")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Hmm. So yes, it might be correct. OTOH, this change may also break
something. So... how was it tested?
Pavel
> ---
> drivers/net/wireless/ti/wl1251/main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
> index 6d02c660b4ab..037defd10b91 100644
> --- a/drivers/net/wireless/ti/wl1251/main.c
> +++ b/drivers/net/wireless/ti/wl1251/main.c
> @@ -1200,8 +1200,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
> WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
>
> enable = bss_conf->arp_addr_cnt == 1 && bss_conf->assoc;
> - wl1251_acx_arp_ip_filter(wl, enable, addr);
> -
> + ret = wl1251_acx_arp_ip_filter(wl, enable, addr);
> if (ret < 0)
> goto out_sleep;
> }
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Pavel Machek <pavel@ucw.cz>
To: Colin King <colin.king@canonical.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
Cong Wang <xiyou.wangcong@gmail.com>,
Johannes Berg <johannes.berg@intel.com>,
"David S . Miller" <davem@davemloft.net>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] wl1251: check return from call to wl1251_acx_arp_ip_filter
Date: Tue, 26 Dec 2017 19:17:33 +0100 [thread overview]
Message-ID: <20171226181733.GA20068@amd> (raw)
In-Reply-To: <20171226173318.5076-1-colin.king@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
On Tue 2017-12-26 17:33:18, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the less than zero error check on ret is incorrect
> as it is checking a far earlier ret assignment rather than the
> return from the call to wl1251_acx_arp_ip_filter. Fix this by
> adding in the missing assginment.
>
> Detected by CoverityScan, CID#1164835 ("Logically dead code")
>
> Fixes: 204cc5c44fb6 ("wl1251: implement hardware ARP filtering")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Hmm. So yes, it might be correct. OTOH, this change may also break
something. So... how was it tested?
Pavel
> ---
> drivers/net/wireless/ti/wl1251/main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
> index 6d02c660b4ab..037defd10b91 100644
> --- a/drivers/net/wireless/ti/wl1251/main.c
> +++ b/drivers/net/wireless/ti/wl1251/main.c
> @@ -1200,8 +1200,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
> WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS);
>
> enable = bss_conf->arp_addr_cnt == 1 && bss_conf->assoc;
> - wl1251_acx_arp_ip_filter(wl, enable, addr);
> -
> + ret = wl1251_acx_arp_ip_filter(wl, enable, addr);
> if (ret < 0)
> goto out_sleep;
> }
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
next prev parent reply other threads:[~2017-12-26 18:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-26 17:33 [PATCH] wl1251: check return from call to wl1251_acx_arp_ip_filter Colin King
2017-12-26 17:33 ` Colin King
2017-12-26 18:17 ` Pavel Machek [this message]
2017-12-26 18:17 ` Pavel Machek
2018-01-08 17:41 ` Kalle Valo
2018-01-08 17:41 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171226181733.GA20068@amd \
--to=pavel@ucw.cz \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.