Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2764f61 authored Jul 05, 2017 by Souptick Joarder Committed by Kalle Valo Jul 28, 2017

rtlwifi: Fix memory leak when firmware request fails



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>

parent 4de95fc5

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}