* [PATCH] iwlwifi: fw: move memset before early return
@ 2022-04-01 23:38 Tom Rix
2022-04-05 18:01 ` Nick Desaulniers
0 siblings, 1 reply; 2+ messages in thread
From: Tom Rix @ 2022-04-01 23:38 UTC (permalink / raw)
To: luciano.coelho, kvalo, davem, kuba, pabeni, nathan, ndesaulniers,
johannes.berg, mukesh.sisodiya, mordechay.goodstein,
matti.gottlieb, rotem.saado
Cc: linux-wireless, netdev, linux-kernel, llvm, Tom Rix
Clang static analysis reports this representative issue
dbg.c:1455:6: warning: Branch condition evaluates to
a garbage value
if (!rxf_data.size)
^~~~~~~~~~~~~~
This check depends on iwl_ini_get_rxf_data() to clear
rxf_data but the function can return early without
doing the clear. So move the memset before the early
return.
Fixes: cc9b6012d34b ("iwlwifi: yoyo: use hweight_long instead of bit manipulating")
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index abf49022edbe..666de922af61 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -1388,13 +1388,13 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,
if (!data)
return;
+ memset(data, 0, sizeof(*data));
+
/* make sure only one bit is set in only one fid */
if (WARN_ONCE(hweight_long(fid1) + hweight_long(fid2) != 1,
"fid1=%x, fid2=%x\n", fid1, fid2))
return;
- memset(data, 0, sizeof(*data));
-
if (fid1) {
fifo_idx = ffs(fid1) - 1;
if (WARN_ONCE(fifo_idx >= MAX_NUM_LMAC, "fifo_idx=%d\n",
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iwlwifi: fw: move memset before early return
2022-04-01 23:38 [PATCH] iwlwifi: fw: move memset before early return Tom Rix
@ 2022-04-05 18:01 ` Nick Desaulniers
0 siblings, 0 replies; 2+ messages in thread
From: Nick Desaulniers @ 2022-04-05 18:01 UTC (permalink / raw)
To: Tom Rix
Cc: luciano.coelho, kvalo, davem, kuba, pabeni, nathan, johannes.berg,
mukesh.sisodiya, mordechay.goodstein, matti.gottlieb, rotem.saado,
linux-wireless, netdev, linux-kernel, llvm
On Fri, Apr 1, 2022 at 4:38 PM Tom Rix <trix@redhat.com> wrote:
>
> Clang static analysis reports this representative issue
> dbg.c:1455:6: warning: Branch condition evaluates to
> a garbage value
> if (!rxf_data.size)
> ^~~~~~~~~~~~~~
>
> This check depends on iwl_ini_get_rxf_data() to clear
> rxf_data but the function can return early without
> doing the clear. So move the memset before the early
> return.
>
> Fixes: cc9b6012d34b ("iwlwifi: yoyo: use hweight_long instead of bit manipulating")
> Signed-off-by: Tom Rix <trix@redhat.com>
Conditional initialization in a helper is a pretty dangerous pattern.
How about we move the memset to the two callers of
iwl_ini_get_rxf_data?
> ---
> drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> index abf49022edbe..666de922af61 100644
> --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
> @@ -1388,13 +1388,13 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,
> if (!data)
> return;
>
> + memset(data, 0, sizeof(*data));
> +
> /* make sure only one bit is set in only one fid */
> if (WARN_ONCE(hweight_long(fid1) + hweight_long(fid2) != 1,
> "fid1=%x, fid2=%x\n", fid1, fid2))
> return;
>
> - memset(data, 0, sizeof(*data));
> -
> if (fid1) {
> fifo_idx = ffs(fid1) - 1;
> if (WARN_ONCE(fifo_idx >= MAX_NUM_LMAC, "fifo_idx=%d\n",
> --
> 2.27.0
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-05 20:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-01 23:38 [PATCH] iwlwifi: fw: move memset before early return Tom Rix
2022-04-05 18:01 ` Nick Desaulniers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).