]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtlwifi: usb: fix workqueue leak when probe fails
authorThadeu Lima de Souza Cascardo <cascardo@igalia.com>
Thu, 7 Nov 2024 13:33:22 +0000 (10:33 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:46:46 +0000 (12:46 +0100)
[ Upstream commit f79bc5c67867c19ce2762e7934c20dbb835ed82c ]

rtl_init_core creates a workqueue that is then assigned to rtl_wq.
rtl_deinit_core does not destroy it. It is left to rtl_usb_deinit, which
must be called in the probe error path.

Fixes: 2ca20f79e0d8 ("rtlwifi: Add usb driver")
Fixes: 851639fdaeac ("rtlwifi: Modify some USB de-initialize code.")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241107133322.855112-6-cascardo@igalia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtlwifi/usb.c

index 66af56a79dbe5b1329c67be6a93ad800a976a977..08ab2482c00cc6cba4b4b35ae90203e6b0d02f49 100644 (file)
@@ -1083,6 +1083,7 @@ error_init_vars:
        wait_for_completion(&rtlpriv->firmware_loading_complete);
        rtlpriv->cfg->ops->deinit_sw_vars(hw);
 error_out:
+       rtl_usb_deinit(hw);
        rtl_deinit_core(hw);
 error_out2:
        _rtl_usb_io_handler_release(hw);