From 9f58d36f67947f9ec539a02622f1865260be6a0c Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Wed, 10 Feb 2021 07:51:15 +0800 Subject: [PATCH] qcacld-3.0: clear obsolete keys before connect start Freeing keys in scheduler thread may cause race condition, to avoid that, clear the obsolete keys before starting a new connection in wpa_supplicant context. Change-Id: Ibeecadb117bca8f88ce5dc052bcebe92423ace22 CRs-Fixed: 2872831 --- core/hdd/src/wlan_hdd_assoc.c | 1 - core/hdd/src/wlan_hdd_cfg80211.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index d056871122b2..131b13a29ada 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -2043,7 +2043,6 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter, if (adapter->device_mode == QDF_STA_MODE) { vdev = hdd_objmgr_get_vdev(adapter); if (vdev) { - wlan_crypto_free_vdev_key(vdev); wlan_crypto_reset_vdev_params(vdev); hdd_objmgr_put_vdev(vdev); } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 43e8160e17d0..f5da0332f5ef 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -19835,6 +19835,7 @@ static void hdd_populate_crypto_params(struct wlan_objmgr_vdev *vdev, } hdd_populate_crypto_auth_type(vdev, req); + wlan_crypto_free_vdev_key(vdev); } #ifdef FEATURE_WLAN_WAPI