From 39c0fea7c7387164240a11374ce6a6901bd409f5 Mon Sep 17 00:00:00 2001 From: Ashok Kumar Date: Fri, 6 Sep 2019 16:42:20 +0530 Subject: [PATCH] qcacmn: Prevent FILS delkey from calling CRYPTO_OPS Prevent delkey to call crypto_ops for FILS cipher type, as this keys are not present in FW. Change-Id: Ica13a62b6822ee3cee40acffa98b7cc1cb122120 CRs-Fixed: 2520517 --- umac/cmn_services/crypto/src/wlan_crypto_global_api.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c index 92c1660e340c..03d7ed98f842 100644 --- a/umac/cmn_services/crypto/src/wlan_crypto_global_api.c +++ b/umac/cmn_services/crypto/src/wlan_crypto_global_api.c @@ -1095,9 +1095,13 @@ QDF_STATUS wlan_crypto_delkey(struct wlan_objmgr_vdev *vdev, cipher_table = (struct wlan_crypto_cipher *)key->cipher_table; qdf_mem_zero(key->keyval, sizeof(key->keyval)); - if (WLAN_CRYPTO_TX_OPS_DELKEY(psoc)) { + if (!IS_FILS_CIPHER(cipher_table->cipher) && + WLAN_CRYPTO_TX_OPS_DELKEY(psoc)) { WLAN_CRYPTO_TX_OPS_DELKEY(psoc)(vdev, key, macaddr, cipher_table->cipher); + } else if (IS_FILS_CIPHER(cipher_table->cipher)) { + if (key->private) + qdf_mem_free(key->private); } } qdf_mem_free(key);