xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtlwifi: Fix memory leak when firmware request fails

Browse Source 
This patch will fix memory leak when firmware request fails

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Souptick Joarder
2017-07-05 19:55:06 +05:30
committed by Kalle Valo
parent 4de95fc5fa
commit f2764f61fa
9 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
View File

@@ -175,6 +175,8 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_info("Failed to request firmware!\n"); pr_info("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }

2
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
View File

@@ -176,6 +176,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }

4
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
View File

@@ -85,6 +85,10 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
err = request_firmware_nowait(THIS_MODULE, 1, err = request_firmware_nowait(THIS_MODULE, 1,
fw_name, rtlpriv->io.dev, fw_name, rtlpriv->io.dev,
GFP_KERNEL, hw, rtl_fw_cb); GFP_KERNEL, hw, rtl_fw_cb);
if (err) {
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
}
return err; return err;
} }

2
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
View File

@@ -183,6 +183,8 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }

2
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
View File

@@ -177,6 +177,8 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }

2
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
View File

@@ -216,6 +216,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
rtl92se_fw_cb); rtl92se_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }

2
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
View File

@@ -184,6 +184,8 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }
return 0; return 0;

2
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
View File

@@ -195,6 +195,8 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request firmware!\n"); pr_err("Failed to request firmware!\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }
} }

6
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
View File

@@ -196,6 +196,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
rtlpriv->rtlhal.wowlan_firmware = vzalloc(0x8000); rtlpriv->rtlhal.wowlan_firmware = vzalloc(0x8000);
if (!rtlpriv->rtlhal.wowlan_firmware) { if (!rtlpriv->rtlhal.wowlan_firmware) {
pr_err("Can't alloc buffer for wowlan fw.\n"); pr_err("Can't alloc buffer for wowlan fw.\n");
vfree(rtlpriv->rtlhal.pfirmware);
rtlpriv->rtlhal.pfirmware = NULL;
return 1; return 1;
} }
@@ -222,6 +224,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
rtl_fw_cb); rtl_fw_cb);
if (err) { if (err) {
pr_err("Failed to request normal firmware!\n"); pr_err("Failed to request normal firmware!\n");
vfree(rtlpriv->rtlhal.wowlan_firmware);
vfree(rtlpriv->rtlhal.pfirmware);
return 1; return 1;
} }
} }
@@ -233,6 +237,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
rtl_wowlan_fw_cb); rtl_wowlan_fw_cb);
if (err) { if (err) {
pr_err("Failed to request wowlan firmware!\n"); pr_err("Failed to request wowlan firmware!\n");
vfree(rtlpriv->rtlhal.wowlan_firmware);
vfree(rtlpriv->rtlhal.pfirmware);
return 1; return 1;
} }
return 0; return 0;