Commit 3f936169 authored by Navid Emamdoost's avatar Navid Emamdoost Committed by Kalle Valo
Browse files

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: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6e7d5977

drivers/net/wireless/realtek/rtlwifi/usb.c

+4 −1
Original line number Diff line number Diff line
@@ -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 @@ int rtl_usb_probe(struct usb_interface *intf, 
	_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);