OSDN Git Service

rtlwifi: rtl8192ee: Fix memory leak when loading firmware
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 14 Sep 2017 18:17:44 +0000 (13:17 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 20 Sep 2017 12:44:44 +0000 (15:44 +0300)
In routine rtl92ee_set_fw_rsvdpagepkt(), the driver allocates an skb, but
never calls rtl_cmd_send_packet(), which will free the buffer. All other
rtlwifi drivers perform this operation correctly.

This problem has been in the driver since it was included in the kernel.
Fortunately, each firmware load only leaks 4 buffers, which likely
explains why it has not previously been detected.

Cc: Stable <stable@vger.kernel.org> # 3.18+
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c

index 7eae27f..f9563ae 100644 (file)
@@ -682,7 +682,7 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct sk_buff *skb = NULL;
-
+       bool rtstatus;
        u32 totalpacketlen;
        u8 u1rsvdpageloc[5] = { 0 };
        bool b_dlok = false;
@@ -768,7 +768,9 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
        skb = dev_alloc_skb(totalpacketlen);
        skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
-       b_dlok = true;
+       rtstatus = rtl_cmd_send_packet(hw, skb);
+       if (rtstatus)
+               b_dlok = true;
 
        if (b_dlok) {
                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD ,