rtlwifi: prevent memory leak in rtl_usb_probe

In rtl_usb_probe if allocation for usb_data fails the allocated hw
should be released. In addition the allocated rtlpriv->usb_data should
be released on error handling path.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index 4b59f3b46b2815f5b863a7d6b32325cd398b1887..348b0072cdd698f25b495da1b580547c59321e8a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1021,8 +1021,10 @@ int rtl_usb_probe(struct usb_interface *intf,
        rtlpriv->hw = hw;
        rtlpriv->usb_data = kcalloc(RTL_USB_MAX_RX_COUNT, sizeof(u32),
                                    GFP_KERNEL);
-       if (!rtlpriv->usb_data)
+       if (!rtlpriv->usb_data) {
+               ieee80211_free_hw(hw);
                return -ENOMEM;
+       }
 
        /* this spin lock must be initialized early */
        spin_lock_init(&rtlpriv->locks.usb_lock);
@@ -1083,6 +1085,7 @@ error_out2:
        _rtl_usb_io_handler_release(hw);
        usb_put_dev(udev);
        complete(&rtlpriv->firmware_loading_complete);
+       kfree(rtlpriv->usb_data);
        return -ENODEV;
 }
 EXPORT_SYMBOL(rtl_usb_probe);