aboutsummaryrefslogtreecommitdiffstats
diff options
authorThadeu Lima de Souza Cascardo <cascardo@igalia.com>2024-11-07 10:33:20 -0300
committerPing-Ke Shih <pkshih@realtek.com>2024-11-18 09:50:20 +0800
commitb4b26642b31ef282df6ff7ea8531985edfdef12a (patch)
tree8071a29555590b635c04456f2ec070190c6d4cf3
parent8559a9e0c457729fe3edb3176bbf7c7874f482b0 (diff)
downloadlinux-b4b26642b31ef282df6ff7ea8531985edfdef12a.tar.gz
wifi: rtlwifi: wait for firmware loading before releasing memory
At probe error path, the firmware loading work may have already been queued. In such a case, it will try to access memory allocated by the probe function, which is about to be released. In such paths, wait for the firmware worker to finish before releasing memory. Fixes: a7f7c15e945a ("rtlwifi: rtl8192cu: Free ieee80211_hw if probing fails") 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-4-cascardo@igalia.com
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/usb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index c3aa0cd9ff2117..c27b116ccdff51 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1028,13 +1028,15 @@ int rtl_usb_probe(struct usb_interface *intf,
err = ieee80211_register_hw(hw);
if (err) {
pr_err("Can't register mac80211 hw.\n");
- goto error_out;
+ goto error_init_vars;
}
rtlpriv->mac80211.mac80211_registered = 1;
set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
return 0;
+error_init_vars:
+ wait_for_completion(&rtlpriv->firmware_loading_complete);
error_out:
rtl_deinit_core(hw);
error_out2: