Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Navid Emamdoost and committed by
Kalle Valo
3f936169 6e7d5977

+4 -1
+4 -1
drivers/net/wireless/realtek/rtlwifi/usb.c
··· 1021 1021 rtlpriv->hw = hw; 1022 1022 rtlpriv->usb_data = kcalloc(RTL_USB_MAX_RX_COUNT, sizeof(u32), 1023 1023 GFP_KERNEL); 1024 - if (!rtlpriv->usb_data) 1024 + if (!rtlpriv->usb_data) { 1025 + ieee80211_free_hw(hw); 1025 1026 return -ENOMEM; 1027 + } 1026 1028 1027 1029 /* this spin lock must be initialized early */ 1028 1030 spin_lock_init(&rtlpriv->locks.usb_lock); ··· 1085 1083 _rtl_usb_io_handler_release(hw); 1086 1084 usb_put_dev(udev); 1087 1085 complete(&rtlpriv->firmware_loading_complete); 1086 + kfree(rtlpriv->usb_data); 1088 1087 return -ENODEV; 1089 1088 } 1090 1089 EXPORT_SYMBOL(rtl_usb_probe);