Commit 29056436 authored by Sascha Hauer's avatar Sascha Hauer Committed by Kalle Valo
Browse files

wifi: rtw88: usb: kill and free rx urbs on probe failure 



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: a82dfd33 ("wifi: rtw88: Add common USB chip support")
Cc: stable@vger.kernel.org
Reported-by: default avatarIlgaz Öcal <ilgaz@ilgaz.gen.tr>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230823075021.588596-1-s.hauer@pengutronix.de
parent 78d84f35

drivers/net/wireless/realtek/rtw88/usb.c

+4 −1
Original line number Diff line number Diff line
@@ -826,7 +826,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) {
@@ -872,6 +872,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);