diff options
| author | Abhishek Singh <absingh@qti.qualcomm.com> | 2015-10-15 11:49:03 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-16 00:57:57 -0700 |
| commit | afaf1aed77675ee43dad1006f7d63bf095b201d4 (patch) | |
| tree | 5c2590ee36396b8837cd2c3bfe296646384281e1 | |
| parent | 6e0d3383b2e5c86c415fbb081b8d60e6e6a7ded5 (diff) | |
qcacld-2.0: Initialize RSNMfpCapable and RSNMfpRequired properly
prima to qcacld-2.0 propagation
In hdd_SetGENIEToCsr, RSNMfpCapable and RSNMfpRequired are not
initialized with 0, so if the IE's provided does not have RSN IE
these variables are not modified to 0 or 1 depending on PMF
capability in RSN IE and thus will have some garbage value.
This will lead to PMF enabled even if RSNIE is not present.
Initializing RSNMfpCapable and RSNMfpRequired with 0 solves the
issue.
Change-Id: If35d9d957d578120f3c0f437734613f2ce2387a7
CRs-Fixed: 919527
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index b19f31b9574d..8a8cacabab11 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -4303,8 +4303,8 @@ int hdd_SetGENIEToCsr( hdd_adapter_t *pAdapter, eCsrAuthType *RSNAuthType) eCsrEncryptionType RSNEncryptType; eCsrEncryptionType mcRSNEncryptType; #ifdef WLAN_FEATURE_11W - u_int8_t RSNMfpRequired; - u_int8_t RSNMfpCapable; + u_int8_t RSNMfpRequired = 0; + u_int8_t RSNMfpCapable = 0; #endif struct ether_addr bSsid; // MAC address of assoc peer // MAC address of assoc peer @@ -4357,10 +4357,14 @@ int hdd_SetGENIEToCsr( hdd_adapter_t *pAdapter, eCsrAuthType *RSNAuthType) } #ifdef WLAN_FEATURE_11W + hddLog( LOG1, FL("RSNMfpRequired = %d, RSNMfpCapable = %d"), + RSNMfpRequired, RSNMfpCapable); pWextState->roamProfile.MFPRequired = RSNMfpRequired; pWextState->roamProfile.MFPCapable = RSNMfpCapable; #endif - hddLog( LOG1, "%s: CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d", __func__, *RSNAuthType, RSNEncryptType, mcRSNEncryptType); + hddLog( LOG1, + FL("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d"), + *RSNAuthType, RSNEncryptType, mcRSNEncryptType); } return 0; } |