* [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset
@ 2023-08-21 16:12 Daniel Golle
2023-08-21 16:30 ` Lorenzo Bianconi
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Daniel Golle @ 2023-08-21 16:12 UTC (permalink / raw)
To: Felix Fietkau, John Crispin, Sean Wang, Mark Lee,
Lorenzo Bianconi, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Matthias Brugger, AngeloGioacchino Del Regno,
Sujuan Chen, netdev, linux-kernel, linux-arm-kernel,
linux-mediatek
When a hardware reset is triggered on devices not initializing WED the
calls to mtk_wed_fe_reset and mtk_wed_fe_reset_complete dereference a
pointer on uninitialized stack memory.
Break out of both functions in case a hw_list entry is 0.
Fixes: 08a764a7c51b ("net: ethernet: mtk_wed: add reset/reset_complete callbacks")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Simon Horman <horms@kernel.org>
---
Changes since v1:
* remove unneeded {} initialization for stack allocated memory
drivers/net/ethernet/mediatek/mtk_wed.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
index 00aeee0d5e45f..94376aa2b34c5 100644
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
@@ -222,9 +222,13 @@ void mtk_wed_fe_reset(void)
for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
struct mtk_wed_hw *hw = hw_list[i];
- struct mtk_wed_device *dev = hw->wed_dev;
+ struct mtk_wed_device *dev;
int err;
+ if (!hw)
+ break;
+
+ dev = hw->wed_dev;
if (!dev || !dev->wlan.reset)
continue;
@@ -245,8 +249,12 @@ void mtk_wed_fe_reset_complete(void)
for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
struct mtk_wed_hw *hw = hw_list[i];
- struct mtk_wed_device *dev = hw->wed_dev;
+ struct mtk_wed_device *dev;
+
+ if (!hw)
+ break;
+ dev = hw->wed_dev;
if (!dev || !dev->wlan.reset_complete)
continue;
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset
2023-08-21 16:12 [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset Daniel Golle
@ 2023-08-21 16:30 ` Lorenzo Bianconi
2023-08-22 18:01 ` Jakub Kicinski
2023-08-22 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Lorenzo Bianconi @ 2023-08-21 16:30 UTC (permalink / raw)
To: Daniel Golle
Cc: Felix Fietkau, John Crispin, Sean Wang, Mark Lee, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Matthias Brugger,
AngeloGioacchino Del Regno, Sujuan Chen, netdev, linux-kernel,
linux-arm-kernel, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]
> When a hardware reset is triggered on devices not initializing WED the
> calls to mtk_wed_fe_reset and mtk_wed_fe_reset_complete dereference a
> pointer on uninitialized stack memory.
> Break out of both functions in case a hw_list entry is 0.
>
> Fixes: 08a764a7c51b ("net: ethernet: mtk_wed: add reset/reset_complete callbacks")
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
> Reviewed-by: Simon Horman <horms@kernel.org>
> ---
> Changes since v1:
> * remove unneeded {} initialization for stack allocated memory
>
> drivers/net/ethernet/mediatek/mtk_wed.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
> index 00aeee0d5e45f..94376aa2b34c5 100644
> --- a/drivers/net/ethernet/mediatek/mtk_wed.c
> +++ b/drivers/net/ethernet/mediatek/mtk_wed.c
> @@ -222,9 +222,13 @@ void mtk_wed_fe_reset(void)
>
> for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
> struct mtk_wed_hw *hw = hw_list[i];
> - struct mtk_wed_device *dev = hw->wed_dev;
> + struct mtk_wed_device *dev;
> int err;
>
> + if (!hw)
> + break;
> +
> + dev = hw->wed_dev;
> if (!dev || !dev->wlan.reset)
> continue;
>
> @@ -245,8 +249,12 @@ void mtk_wed_fe_reset_complete(void)
>
> for (i = 0; i < ARRAY_SIZE(hw_list); i++) {
> struct mtk_wed_hw *hw = hw_list[i];
> - struct mtk_wed_device *dev = hw->wed_dev;
> + struct mtk_wed_device *dev;
> +
> + if (!hw)
> + break;
>
> + dev = hw->wed_dev;
> if (!dev || !dev->wlan.reset_complete)
> continue;
>
> --
> 2.41.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset
2023-08-21 16:12 [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset Daniel Golle
2023-08-21 16:30 ` Lorenzo Bianconi
@ 2023-08-22 18:01 ` Jakub Kicinski
2023-08-22 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2023-08-22 18:01 UTC (permalink / raw)
To: Daniel Golle
Cc: Felix Fietkau, John Crispin, Sean Wang, Mark Lee,
Lorenzo Bianconi, David S. Miller, Eric Dumazet, Paolo Abeni,
Matthias Brugger, AngeloGioacchino Del Regno, Sujuan Chen, netdev,
linux-kernel, linux-arm-kernel, linux-mediatek
On Mon, 21 Aug 2023 17:12:44 +0100 Daniel Golle wrote:
> Changes since v1:
> * remove unneeded {} initialization for stack allocated memory
s/stack/.bss/, FWIW, thanks for updating!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset
2023-08-21 16:12 [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset Daniel Golle
2023-08-21 16:30 ` Lorenzo Bianconi
2023-08-22 18:01 ` Jakub Kicinski
@ 2023-08-22 18:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-08-22 18:10 UTC (permalink / raw)
To: Daniel Golle
Cc: nbd, john, sean.wang, Mark-MC.Lee, lorenzo, davem, edumazet, kuba,
pabeni, matthias.bgg, angelogioacchino.delregno, sujuan.chen,
netdev, linux-kernel, linux-arm-kernel, linux-mediatek
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 21 Aug 2023 17:12:44 +0100 you wrote:
> When a hardware reset is triggered on devices not initializing WED the
> calls to mtk_wed_fe_reset and mtk_wed_fe_reset_complete dereference a
> pointer on uninitialized stack memory.
> Break out of both functions in case a hw_list entry is 0.
>
> Fixes: 08a764a7c51b ("net: ethernet: mtk_wed: add reset/reset_complete callbacks")
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> Reviewed-by: Simon Horman <horms@kernel.org>
>
> [...]
Here is the summary with links:
- [net,v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset
https://git.kernel.org/netdev/net/c/604204fcb321
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-22 18:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-21 16:12 [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset Daniel Golle
2023-08-21 16:30 ` Lorenzo Bianconi
2023-08-22 18:01 ` Jakub Kicinski
2023-08-22 18:10 ` patchwork-bot+netdevbpf
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).