qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: pnvm: Fix a memory leak in 'iwl_pnvm_get_from_fs()' 

Bugzilla: http://bugzilla.redhat.com/2033354

commit 45010c080e6e7434fcae73212b0087a03590049f
Author: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date:   Thu Sep 2 22:38:11 2021 +0200

    iwlwifi: pnvm: Fix a memory leak in 'iwl_pnvm_get_from_fs()'
    
    A firmware is requested but never released in this function. This leads to
    a memory leak in the normal execution path.
    
    Add the missing 'release_firmware()' call.
    Also introduce a temp variable (new_len) in order to keep the value of
    'pnvm->size' after the firmware has been released.
    
    Fixes: cdda18fbbe ("iwlwifi: pnvm: move file loading code to a separate function")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Luca Coelho <luca@coelho.fi>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/1b5d80f54c1dbf85710fd285243932943b498fe7.1630614969.git.christophe.jaillet@wanadoo.fr

Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
This commit is contained in:
Íñigo Huguet 2021-12-22 13:46:07 +01:00
parent 0f70d6d000
commit 622a478e73
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
View File

@ -231,6 +231,7 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)
{
const struct firmware *pnvm;
char pnvm_name[MAX_PNVM_NAME];
size_t new_len;
int ret;
iwl_pnvm_get_fs_name(trans, pnvm_name, sizeof(pnvm_name));
@ -242,11 +243,14 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)
return ret;
}
new_len = pnvm->size;
*data = kmemdup(pnvm->data, pnvm->size, GFP_KERNEL);
release_firmware(pnvm);
if (!*data)
return -ENOMEM;
*len = pnvm->size;
*len = new_len;
return 0;
}