[PATCH] wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()

[PATCH] wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()

[Christophe JAILLET]

'ret' is not updated after a function call in rtw89_core_sta_assoc().
This prevent error handling from working.

Add the missing assignment.

Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/net/wireless/realtek/rtw89/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index e716b96d0f56..f30aadc41f2b 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -2535,7 +2535,7 @@ int rtw89_core_sta_assoc(struct rtw89_dev *rtwdev,
 	}
 
 	/* update cam aid mac_id net_type */
-	rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL);
+	ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL);
 	if (ret) {
 		rtw89_warn(rtwdev, "failed to send h2c cam\n");
 		return ret;
-- 
2.34.1

RE: [PATCH] wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()

[Ping-Ke Shih]

> -----Original Message-----
> From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Sent: Sunday, November 13, 2022 11:49 PM
> To: Ping-Ke Shih <pkshih@realtek.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller <davem@davemloft.net>;
> Eric Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>
> Cc: linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe JAILLET
> <christophe.jaillet@wanadoo.fr>; linux-wireless@vger.kernel.org; netdev@vger.kernel.org
> Subject: [PATCH] wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()
> 
> 'ret' is not updated after a function call in rtw89_core_sta_assoc().
> This prevent error handling from working.
> 
> Add the missing assignment.
> 
> Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>

> ---
>  drivers/net/wireless/realtek/rtw89/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
> index e716b96d0f56..f30aadc41f2b 100644
> --- a/drivers/net/wireless/realtek/rtw89/core.c
> +++ b/drivers/net/wireless/realtek/rtw89/core.c
> @@ -2535,7 +2535,7 @@ int rtw89_core_sta_assoc(struct rtw89_dev *rtwdev,
>  	}
> 
>  	/* update cam aid mac_id net_type */
> -	rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL);
> +	ret = rtw89_fw_h2c_cam(rtwdev, rtwvif, rtwsta, NULL);
>  	if (ret) {
>  		rtw89_warn(rtwdev, "failed to send h2c cam\n");
>  		return ret;
> --
> 2.34.1

Re: [PATCH] wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()

[Kalle Valo]

Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:

> 'ret' is not updated after a function call in rtw89_core_sta_assoc().
> This prevent error handling from working.
> 
> Add the missing assignment.
> 
> Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>

Patch applied to wireless-next.git, thanks.

81c0b8928437 wifi: rtw89: Fix some error handling path in rtw89_core_sta_assoc()

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/7b1d82594635e4406d3438f33d8da29eaa056c5a.1668354547.git.christophe.jaillet@wanadoo.fr/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches