[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ffe7cc73-d2c7-d6d7-69e8-438a4a2f7be6@lwfinger.net>
Date: Wed, 23 Aug 2023 10:54:30 -0500
From: Larry Finger <Larry.Finger@...inger.net>
To: Sascha Hauer <s.hauer@...gutronix.de>,
linux-wireless@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Ping-Ke Shih <pkshih@...ltek.com>,
Kalle Valo <kvalo@...nel.org>,
Ilgaz Öcal <ilgaz@...az.gen.tr>,
kernel@...gutronix.de
Subject: Re: [PATCH] wifi: rtw88: usb: kill and free rx urbs on probe failure
On 8/23/23 02:50, Sascha Hauer wrote:
> After rtw_usb_alloc_rx_bufs() has been called rx urbs have been
> allocated and must be freed in the error path. After rtw_usb_init_rx()
> has been called they are submitted, so they also must be killed.
>
> Add these forgotten steps to the probe error path.
>
> Besides the lost memory this also fixes a problem when the driver
> fails to download the firmware in rtw_chip_info_setup(). In this
> case it can happen that the completion of the rx urbs handler runs
> at a time when we already freed our data structures resulting in
> a kernel crash.
>
> fixes: a82dfd33d1237 ("wifi: rtw88: Add common USB chip support")
> Cc: stable@...r.kernel.org
> Reported-by: Ilgaz Öcal <ilgaz@...az.gen.tr>
> Signed-off-by: Sascha Hauer <s.hauer@...gutronix.de>
> ---
> drivers/net/wireless/realtek/rtw88/usb.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c
> index 4a57efdba97bb..875a61c9c80d4 100644
> --- a/drivers/net/wireless/realtek/rtw88/usb.c
> +++ b/drivers/net/wireless/realtek/rtw88/usb.c
> @@ -844,7 +844,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
>
> ret = rtw_core_init(rtwdev);
> if (ret)
> - goto err_release_hw;
> + goto err_free_rx_bufs;
>
> ret = rtw_usb_intf_init(rtwdev, intf);
> if (ret) {
> @@ -890,6 +890,9 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
> err_deinit_core:
> rtw_core_deinit(rtwdev);
>
> +err_free_rx_bufs:
> + rtw_usb_free_rx_bufs(rtwusb);
> +
> err_release_hw:
> ieee80211_free_hw(hw);
>
Acked-by: Larry Finger <Larry.Finger@...inger.net>
Thanks Sasha,
Larry
Powered by blists - more mailing lists