diff mbox series

[1/4,v6] wifi: rtw88: delete timer and free skb queue when unloading

Message ID 20230628072327.167196-1-dmantipov@yandex.ru (mailing list archive)
State Accepted
Commit 634fcbcaa4062db39aeb5ac6ed1bc1feb8dd5216
Delegated to: Kalle Valo
Headers show
Series [1/4,v6] wifi: rtw88: delete timer and free skb queue when unloading | expand

Commit Message

Dmitry Antipov June 28, 2023, 7:23 a.m. UTC 
Fix possible crash and memory leak on driver unload by deleting
TX purge timer and freeing C2H queue in 'rtw_core_deinit()',
shrink critical section in the latter by freeing COEX queue
out of TX report lock scope.

Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v6: adjust to match series
v5: adjust to match recent changes
v4: adjust to match series
v3: shrink critical section in rtw_core_deinit() (Ping-Ke Shih)
v2: fix title and commit message (Kalle Valo)
---
 drivers/net/wireless/realtek/rtw88/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Kalle Valo July 25, 2023, 2:43 p.m. UTC | #1 
Dmitry Antipov <dmantipov@yandex.ru> wrote:

> Fix possible crash and memory leak on driver unload by deleting
> TX purge timer and freeing C2H queue in 'rtw_core_deinit()',
> shrink critical section in the latter by freeing COEX queue
> out of TX report lock scope.
> 
> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

4 patches applied to wireless-next.git, thanks.

634fcbcaa406 wifi: rtw88: delete timer and free skb queue when unloading
6ca25a31e0a8 wifi: rtw88: remove unused and set but unused leftovers
e88c9558951f wifi: rtw88: remove unused USB bulkout size set
8986f0a9a3bb wifi: rtw88: simplify vif iterators
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index c853e2f2d448..c2ddb4d382af 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -2183,10 +2183,12 @@  void rtw_core_deinit(struct rtw_dev *rtwdev)
 		release_firmware(wow_fw->firmware);
 
 	destroy_workqueue(rtwdev->tx_wq);
+	timer_delete_sync(&rtwdev->tx_report.purge_timer);
 	spin_lock_irqsave(&rtwdev->tx_report.q_lock, flags);
 	skb_queue_purge(&rtwdev->tx_report.queue);
-	skb_queue_purge(&rtwdev->coex.queue);
 	spin_unlock_irqrestore(&rtwdev->tx_report.q_lock, flags);
+	skb_queue_purge(&rtwdev->coex.queue);
+	skb_queue_purge(&rtwdev->c2h_queue);
 
 	list_for_each_entry_safe(rsvd_pkt, tmp, &rtwdev->rsvd_page_list,
 				 build_list) {