[v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset

[PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset

Posted by Daniel Golle 2 years, 5 months ago

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

Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset

Posted by patchwork-bot+netdevbpf@kernel.org 2 years, 5 months ago

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

Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset

Posted by Jakub Kicinski 2 years, 5 months ago

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!

Re: [PATCH net v2] net: ethernet: mtk_eth_soc: fix NULL pointer on hw reset

Posted by Lorenzo Bianconi 2 years, 5 months ago

> 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