]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: rtlwifi: wait for firmware loading before releasing memory
authorThadeu Lima de Souza Cascardo <cascardo@igalia.com>
Thu, 7 Nov 2024 13:33:20 +0000 (10:33 -0300)
committerPing-Ke Shih <pkshih@realtek.com>
Mon, 18 Nov 2024 01:50:20 +0000 (09:50 +0800)
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
drivers/net/wireless/realtek/rtlwifi/usb.c

index c3aa0cd9ff2117caed8698b91bd5c7c41aa421d4..c27b116ccdff5119cbcd98e627cd4b1993bd7391 100644 (file)
@@ -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: