redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

rtlwifi: prevent memory leak in rtl_usb_probe 

[ Upstream commit 3f93616951 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Navid Emamdoost 2019-09-24 20:20:21 -05:00 committed by Greg Kroah-Hartman
parent d8c47cad12
commit 39a974f897
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/realtek/rtlwifi/usb.c
View File

@ -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);