* [PATCH v2] iwlwifi: mvm: Fix an error handling path in 'iwl_mvm_wowlan_config_key_params()'
@ 2021-01-24 8:11 ` Christophe JAILLET
0 siblings, 0 replies; 2+ messages in thread
From: Christophe JAILLET @ 2021-01-24 8:11 UTC (permalink / raw)
To: luciano.coelho, kvalo, davem, kuba, mordechay.goodstein,
johannes.berg, sara.sharon, nathan.errera, Dan1.Halperin,
emmanuel.grumbach, naftali.goldstein, netdev
Cc: linux-wireless, linux-kernel, kernel-janitors, Christophe JAILLET
If the 'cmd_ver' check fails, we must release some memory as already done
in all the other error handling paths of this function.
Fixes: 9e3c39361a30 ("iwlwifi: mvm: support new KEK KCK api")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v1->v2: Fix the subject
---
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index c025188fa9bc..2fb897cbfca6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -810,8 +810,10 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
WOWLAN_KEK_KCK_MATERIAL,
IWL_FW_CMD_VER_UNKNOWN);
if (WARN_ON(cmd_ver != 2 && cmd_ver != 3 &&
- cmd_ver != IWL_FW_CMD_VER_UNKNOWN))
- return -EINVAL;
+ cmd_ver != IWL_FW_CMD_VER_UNKNOWN)) {
+ ret = -EINVAL;
+ goto out;
+ }
if (cmd_ver == 3)
cmd_size = sizeof(struct iwl_wowlan_kek_kck_material_cmd_v3);
else
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] iwlwifi: mvm: Fix an error handling path in 'iwl_mvm_wowlan_config_key_params()'
@ 2021-01-24 8:11 ` Christophe JAILLET
0 siblings, 0 replies; 2+ messages in thread
From: Christophe JAILLET @ 2021-01-24 8:11 UTC (permalink / raw)
To: luciano.coelho, kvalo, davem, kuba, mordechay.goodstein,
johannes.berg, sara.sharon, nathan.errera, Dan1.Halperin,
emmanuel.grumbach, naftali.goldstein, netdev
Cc: linux-wireless, linux-kernel, kernel-janitors, Christophe JAILLET
If the 'cmd_ver' check fails, we must release some memory as already done
in all the other error handling paths of this function.
Fixes: 9e3c39361a30 ("iwlwifi: mvm: support new KEK KCK api")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v1->v2: Fix the subject
---
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index c025188fa9bc..2fb897cbfca6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -810,8 +810,10 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
WOWLAN_KEK_KCK_MATERIAL,
IWL_FW_CMD_VER_UNKNOWN);
if (WARN_ON(cmd_ver != 2 && cmd_ver != 3 &&
- cmd_ver != IWL_FW_CMD_VER_UNKNOWN))
- return -EINVAL;
+ cmd_ver != IWL_FW_CMD_VER_UNKNOWN)) {
+ ret = -EINVAL;
+ goto out;
+ }
if (cmd_ver = 3)
cmd_size = sizeof(struct iwl_wowlan_kek_kck_material_cmd_v3);
else
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-24 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 8:11 [PATCH v2] iwlwifi: mvm: Fix an error handling path in 'iwl_mvm_wowlan_config_key_params()' Christophe JAILLET
2021-01-24 8:11 ` Christophe JAILLET
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.