netdev - [PATCH v2] iwlwifi: mvm: Fix an error handling path in 'iwl_mvm_wowlan_config_key

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20210124081107.732360-1-christophe.jaillet@wanadoo.fr>
Date:   Sun, 24 Jan 2021 09:11:07 +0100
From:   Christophe JAILLET <christophe.jaillet@...adoo.fr>
To:     luciano.coelho@...el.com, kvalo@...eaurora.org,
        davem@...emloft.net, kuba@...nel.org,
        mordechay.goodstein@...el.com, johannes.berg@...el.com,
        sara.sharon@...el.com, nathan.errera@...el.com,
        Dan1.Halperin@...el.com, emmanuel.grumbach@...el.com,
        naftali.goldstein@...el.com, netdev@...r.kernel.org
Cc:     linux-wireless@...r.kernel.org, linux-kernel@...r.kernel.org,
        kernel-janitors@...r.kernel.org,
        Christophe JAILLET <christophe.jaillet@...adoo.fr>
Subject: [PATCH v2] iwlwifi: mvm: Fix an error handling path in 'iwl_mvm_wowlan_config_key_params()'

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@...adoo.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