diff mbox series

[net] iwlwifi: pnvm: fix resource leaks in iwl_pnvm_get_from_fs

Message ID 1620472165-7960-1-git-send-email-wangyunjian@huawei.com (mailing list archive)
State Awaiting Upstream
Delegated to: Netdev Maintainers
Headers show
Series [net] iwlwifi: pnvm: fix resource leaks in iwl_pnvm_get_from_fs | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net
netdev/subject_prefix success Link
netdev/cc_maintainers warning 3 maintainers not CCed: johannes.berg@intel.com kvalo@codeaurora.org pierre-louis.bossart@linux.intel.com
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 39 this patch: 39
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 14 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 32 this patch: 32
netdev/header_inline success Link

Commit Message

wangyunjian May 8, 2021, 11:09 a.m. UTC 
From: Yunjian Wang <wangyunjian@huawei.com>

Currently the error return path does not release the "pnvm" when
kmemdup fails and also the "pnvm" is not relased in the normal
path. These lead to a resource leak. Fix these by releasing "pnvm"
before return.

Addresses-Coverity: ("Resource leak")
Fixes: cdda18fbbefa ("iwlwifi: pnvm: move file loading code to a separate function")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
index 40f2109a097f..d4ac83848926 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
@@ -322,10 +322,13 @@  static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)
 	}
 
 	*data = kmemdup(pnvm->data, pnvm->size, GFP_KERNEL);
-	if (!*data)
+	if (!*data) {
+		release_firmware(pnvm);
 		return -ENOMEM;
+	}
 
 	*len = pnvm->size;
+	release_firmware(pnvm);
 
 	return 0;
 }