* [PATCH 2/2] mt76: mt7921: remove incorrect error handling
2021-02-25 14:59 [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Arnd Bergmann
@ 2021-02-25 14:59 ` Arnd Bergmann
2021-02-25 21:41 ` Nick Desaulniers
2021-02-26 9:22 ` Kalle Valo
2021-02-25 16:00 ` [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Kalle Valo
` (2 subsequent siblings)
3 siblings, 2 replies; 7+ messages in thread
From: Arnd Bergmann @ 2021-02-25 14:59 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi, Kalle Valo, David S. Miller,
Jakub Kicinski, Matthias Brugger
Cc: Arnd Bergmann, Ryder Lee, Nathan Chancellor, Nick Desaulniers,
Sean Wang, Soul Huang, linux-wireless, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel, clang-built-linux
From: Arnd Bergmann <arnd@arndb.de>
Clang points out a mistake in the error handling in
mt7921_mcu_tx_rate_report(), which tries to dereference a pointer that
cannot be initialized because of the error that is being handled:
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:409:3: warning: variable 'stats' is uninitialized when used here [-Wuninitialized]
stats->tx_rate = rate;
^~~~~
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:401:32: note: initialize the variable 'stats' to silence this warning
struct mt7921_sta_stats *stats;
^
Just remove the obviously incorrect line.
Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index db125cd22b91..b5cc72e7e81c 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -405,10 +405,8 @@ mt7921_mcu_tx_rate_report(struct mt7921_dev *dev, struct sk_buff *skb,
if (wlan_idx >= MT76_N_WCIDS)
return;
wcid = rcu_dereference(dev->mt76.wcid[wlan_idx]);
- if (!wcid) {
- stats->tx_rate = rate;
+ if (!wcid)
return;
- }
msta = container_of(wcid, struct mt7921_sta, wcid);
stats = &msta->stats;
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] mt76: mt7921: remove incorrect error handling
2021-02-25 14:59 ` [PATCH 2/2] mt76: mt7921: remove incorrect error handling Arnd Bergmann
@ 2021-02-25 21:41 ` Nick Desaulniers
2021-02-26 9:22 ` Kalle Valo
1 sibling, 0 replies; 7+ messages in thread
From: Nick Desaulniers @ 2021-02-25 21:41 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, Kalle Valo, David S. Miller,
Jakub Kicinski, Matthias Brugger, Arnd Bergmann, Ryder Lee,
Nathan Chancellor, Sean Wang, Soul Huang, linux-wireless,
Network Development, Linux ARM, linux-mediatek, LKML,
clang-built-linux
On Thu, Feb 25, 2021 at 7:00 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Clang points out a mistake in the error handling in
> mt7921_mcu_tx_rate_report(), which tries to dereference a pointer that
> cannot be initialized because of the error that is being handled:
>
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:409:3: warning: variable 'stats' is uninitialized when used here [-Wuninitialized]
> stats->tx_rate = rate;
> ^~~~~
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:401:32: note: initialize the variable 'stats' to silence this warning
> struct mt7921_sta_stats *stats;
> ^
> Just remove the obviously incorrect line.
Yeah, looks like perhaps a small mistake from when the driver was
introduced. Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
>
> Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> index db125cd22b91..b5cc72e7e81c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> @@ -405,10 +405,8 @@ mt7921_mcu_tx_rate_report(struct mt7921_dev *dev, struct sk_buff *skb,
> if (wlan_idx >= MT76_N_WCIDS)
> return;
> wcid = rcu_dereference(dev->mt76.wcid[wlan_idx]);
> - if (!wcid) {
> - stats->tx_rate = rate;
> + if (!wcid)
> return;
> - }
>
> msta = container_of(wcid, struct mt7921_sta, wcid);
> stats = &msta->stats;
> --
> 2.29.2
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] mt76: mt7921: remove incorrect error handling
2021-02-25 14:59 ` [PATCH 2/2] mt76: mt7921: remove incorrect error handling Arnd Bergmann
2021-02-25 21:41 ` Nick Desaulniers
@ 2021-02-26 9:22 ` Kalle Valo
1 sibling, 0 replies; 7+ messages in thread
From: Kalle Valo @ 2021-02-26 9:22 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, David S. Miller, Jakub Kicinski,
Matthias Brugger, Arnd Bergmann, Ryder Lee, Nathan Chancellor,
Nick Desaulniers, Sean Wang, Soul Huang, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel,
clang-built-linux
Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Clang points out a mistake in the error handling in
> mt7921_mcu_tx_rate_report(), which tries to dereference a pointer that
> cannot be initialized because of the error that is being handled:
>
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:409:3: warning: variable 'stats' is uninitialized when used here [-Wuninitialized]
> stats->tx_rate = rate;
> ^~~~~
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:401:32: note: initialize the variable 'stats' to silence this warning
> struct mt7921_sta_stats *stats;
> ^
> Just remove the obviously incorrect line.
>
> Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Patch applied to wireless-drivers.git, thanks.
fb5fabb192b2 mt76: mt7921: remove incorrect error handling
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210225145953.404859-2-arnd@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable
2021-02-25 14:59 [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Arnd Bergmann
2021-02-25 14:59 ` [PATCH 2/2] mt76: mt7921: remove incorrect error handling Arnd Bergmann
@ 2021-02-25 16:00 ` Kalle Valo
2021-02-25 17:58 ` Nathan Chancellor
2021-02-26 9:23 ` Kalle Valo
3 siblings, 0 replies; 7+ messages in thread
From: Kalle Valo @ 2021-02-25 16:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, David S. Miller, Jakub Kicinski,
Arnd Bergmann, Ryder Lee, Matthias Brugger, Nathan Chancellor,
Nick Desaulniers, Shayne Chen, Sean Wang, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel,
clang-built-linux
Arnd Bergmann <arnd@kernel.org> writes:
> From: Arnd Bergmann <arnd@arndb.de>
>
> clang points out a possible corner case in the mt7915_tm_set_tx_cont()
> function if called with invalid arguments:
>
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
> default:
> ^~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
> rateval = mode << 6 | rate_idx;
> ^~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
> u8 rate_idx = td->tx_rate_idx, mode;
> ^
>
> Change it to return an error instead of continuing with invalid data
> here.
>
> Fixes: 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Felix, can I take these two to wireless-drivers? An ack would be good.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable
2021-02-25 14:59 [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Arnd Bergmann
2021-02-25 14:59 ` [PATCH 2/2] mt76: mt7921: remove incorrect error handling Arnd Bergmann
2021-02-25 16:00 ` [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Kalle Valo
@ 2021-02-25 17:58 ` Nathan Chancellor
2021-02-26 9:23 ` Kalle Valo
3 siblings, 0 replies; 7+ messages in thread
From: Nathan Chancellor @ 2021-02-25 17:58 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, Kalle Valo, David S. Miller,
Jakub Kicinski, Arnd Bergmann, Ryder Lee, Matthias Brugger,
Nick Desaulniers, Shayne Chen, Sean Wang, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel,
clang-built-linux
On Thu, Feb 25, 2021 at 03:59:14PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> clang points out a possible corner case in the mt7915_tm_set_tx_cont()
> function if called with invalid arguments:
>
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
> default:
> ^~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
> rateval = mode << 6 | rate_idx;
> ^~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
> u8 rate_idx = td->tx_rate_idx, mode;
> ^
>
> Change it to return an error instead of continuing with invalid data
> here.
>
> Fixes: 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
> index 7fb2170a9561..aa629e1fb420 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
> @@ -543,6 +543,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
> tx_cont->bw = CMD_CBW_20MHZ;
> break;
> default:
> + return -EINVAL;
Remove the break if we are adding a return?
> break;
> }
>
> @@ -591,6 +592,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)
> mode = MT_PHY_TYPE_HE_MU;
> break;
> default:
> + return -EINVAL;
> break;
> }
>
> --
> 2.29.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable
2021-02-25 14:59 [PATCH 1/2] mt76: mt7915: fix unused 'mode' variable Arnd Bergmann
` (2 preceding siblings ...)
2021-02-25 17:58 ` Nathan Chancellor
@ 2021-02-26 9:23 ` Kalle Valo
3 siblings, 0 replies; 7+ messages in thread
From: Kalle Valo @ 2021-02-26 9:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Felix Fietkau, Lorenzo Bianconi, David S. Miller, Jakub Kicinski,
Arnd Bergmann, Ryder Lee, Matthias Brugger, Nathan Chancellor,
Nick Desaulniers, Shayne Chen, Sean Wang, linux-wireless, netdev,
linux-arm-kernel, linux-mediatek, linux-kernel,
clang-built-linux
Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> clang points out a possible corner case in the mt7915_tm_set_tx_cont()
> function if called with invalid arguments:
>
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:593:2: warning: variable 'mode' is used uninitialized whenever switch default is taken [-Wsometimes-uninitialized]
> default:
> ^~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:597:13: note: uninitialized use occurs here
> rateval = mode << 6 | rate_idx;
> ^~~~
> drivers/net/wireless/mediatek/mt76/mt7915/testmode.c:506:37: note: initialize the variable 'mode' to silence this warning
> u8 rate_idx = td->tx_rate_idx, mode;
> ^
>
> Change it to return an error instead of continuing with invalid data
> here.
>
> Fixes: 3f0caa3cbf94 ("mt76: mt7915: add support for continuous tx in testmode")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Please remove the break and send v2.
Patch set to Changes Requested.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210225145953.404859-1-arnd@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 7+ messages in thread