lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: r8712u: Fix memory leak in firmware loading

Browse Source 
The error path leaks the firmware struct.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Larry Finger
2011-01-14 14:54:08 -06:00
committed by Greg Kroah-Hartman
parent 8e290fd41a
commit e375870b92
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/rtl8712/hal_init.c
View File

@@ -128,12 +128,13 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
u8 *ptmpchar = NULL, *ppayload, *ptr; u8 *ptmpchar = NULL, *ppayload, *ptr;
struct tx_desc *ptx_desc; struct tx_desc *ptx_desc;
u32 txdscp_sz = sizeof(struct tx_desc); u32 txdscp_sz = sizeof(struct tx_desc);
u8 ret = _FAIL;
ulfilelength = rtl871x_open_fw(padapter, &phfwfile_hdl, &pmappedfw); ulfilelength = rtl871x_open_fw(padapter, &phfwfile_hdl, &pmappedfw);
if (pmappedfw && (ulfilelength > 0)) { if (pmappedfw && (ulfilelength > 0)) {
update_fwhdr(&fwhdr, pmappedfw); update_fwhdr(&fwhdr, pmappedfw);
if (chk_fwhdr(&fwhdr, ulfilelength) == _FAIL) if (chk_fwhdr(&fwhdr, ulfilelength) == _FAIL)
goto exit_fail; goto firmware_rel;
fill_fwpriv(padapter, &fwhdr.fwpriv); fill_fwpriv(padapter, &fwhdr.fwpriv);
/* firmware check ok */ /* firmware check ok */
maxlen = (fwhdr.img_IMEM_size > fwhdr.img_SRAM_size) ? maxlen = (fwhdr.img_IMEM_size > fwhdr.img_SRAM_size) ?
@@ -141,7 +142,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
maxlen += txdscp_sz; maxlen += txdscp_sz;
ptmpchar = _malloc(maxlen + FWBUFF_ALIGN_SZ); ptmpchar = _malloc(maxlen + FWBUFF_ALIGN_SZ);
if (ptmpchar == NULL) if (ptmpchar == NULL)
return _FAIL; goto firmware_rel;
ptx_desc = (struct tx_desc *)(ptmpchar + FWBUFF_ALIGN_SZ - ptx_desc = (struct tx_desc *)(ptmpchar + FWBUFF_ALIGN_SZ -
((addr_t)(ptmpchar) & (FWBUFF_ALIGN_SZ - 1))); ((addr_t)(ptmpchar) & (FWBUFF_ALIGN_SZ - 1)));
@@ -273,11 +274,13 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
goto exit_fail; goto exit_fail;
} else } else
goto exit_fail; goto exit_fail;
return _SUCCESS; ret = _SUCCESS;
exit_fail: exit_fail:
kfree(ptmpchar); kfree(ptmpchar);
return _FAIL; firmware_rel:
release_firmware((struct firmware *)phfwfile_hdl);
return ret;
} }
uint rtl8712_hal_init(struct _adapter *padapter) uint rtl8712_hal_init(struct _adapter *padapter)