summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-29 04:44:06 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-29 04:44:06 -0700
commitce5af24c2e33f02594b8201cd9dbb52617503acb (patch)
tree74fc2a7671bf2b622e8a6e5c7383a5cc652956ff
parentd01259870860e46491e7885049bf5682b142b20a (diff)
parent01b4983e6d1b7df21170b849d75f605afe1aa389 (diff)
Merge "qcacld-2.0: Add check to Validate cfg_ini" into wlan-cld2.driver.lnx.1.0-dev
-rw-r--r--CORE/HDD/src/wlan_hdd_assoc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 10f48ce852fe..7ce9dfef12ca 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1827,7 +1827,12 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs
#ifdef FEATURE_WLAN_AUTO_SHUTDOWN
wlan_hdd_auto_shutdown_enable(pHddCtx, VOS_FALSE);
#endif
-
+ /* validate cfg_ini */
+ if (!pHddCtx->cfg_ini) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "cfg_ini is NULL");
+ return eHAL_STATUS_E_NULL_VALUE;
+ }
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
if ((pHddCtx->cfg_ini->WlanMccToSccSwitchMode
!= VOS_MCC_TO_SCC_SWITCH_DISABLE) &&