qcacld-3.0: Fix uninitialized issue while BMI failed

Initialize gp_cds_context->cfg_ctx before any error case happened and
goto err_wma_close. Otherwise, in wma_wmi_service_close, it's trying to
free uninitialized gp_cds_context->cfg_ctx.

Change-Id: I822ecf77676b9d638c414afb544fdb41d7b1d146
CRs-Fixed: 2355042
This commit is contained in:
hangtian
2018-11-26 15:44:38 +08:00
committed by nshrivas
parent ea9e8bcf92
commit e52fa917b9
2 changed files with 3 additions and 1 deletions

View File

@@ -601,6 +601,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
ucfg_mlme_set_sap_max_peers(psoc, cds_cfg->max_station); ucfg_mlme_set_sap_max_peers(psoc, cds_cfg->max_station);
HTCHandle = cds_get_context(QDF_MODULE_ID_HTC); HTCHandle = cds_get_context(QDF_MODULE_ID_HTC);
gp_cds_context->cfg_ctx = NULL;
if (!HTCHandle) { if (!HTCHandle) {
cds_alert("HTCHandle is null!"); cds_alert("HTCHandle is null!");

View File

@@ -4673,7 +4673,8 @@ QDF_STATUS wma_wmi_service_close(void)
/* free the wma_handle */ /* free the wma_handle */
cds_free_context(QDF_MODULE_ID_WMA, wma_handle); cds_free_context(QDF_MODULE_ID_WMA, wma_handle);
qdf_mem_free(((struct cds_context *) cds_ctx)->cfg_ctx); if (((struct cds_context *)cds_ctx)->cfg_ctx)
qdf_mem_free(((struct cds_context *)cds_ctx)->cfg_ctx);
((struct cds_context *)cds_ctx)->cfg_ctx = NULL; ((struct cds_context *)cds_ctx)->cfg_ctx = NULL;
WMA_LOGD("%s: Exit", __func__); WMA_LOGD("%s: Exit", __func__);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;