samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

qcacmn: Fix memory leak during channel list building

Sfoglia il codice sorgente 
Free the reg rule pointers while handing error conditions.
Also free pointers when channel list building is completed.

Change-Id: I4c8d67ae191f86175f9cc684ba703fea11e66f1f
CRs-Fixed: 2002892
This commit is contained in:
Baila, Shashikala Prabhu
2017-05-05 09:02:11 +05:30
parent ae499840fc
commit 03816f3742
1 ha cambiato i file con 23 aggiunte e 7 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

30
umac/regulatory/core/src/reg_services.c
Vedi File

@@ -2062,6 +2062,9 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc,
err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair);
if (err == QDF_STATUS_E_FAILURE) {
reg_err("%s : Unable to set country code\n", __func__);
qdf_mem_free(reg_info->reg_rules_2g_ptr);
qdf_mem_free(reg_info->reg_rules_5g_ptr);
qdf_mem_free(reg_info);
return QDF_STATUS_E_FAILURE;
}
@@ -2074,6 +2077,9 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc,
err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair);
if (err == QDF_STATUS_E_FAILURE) {
reg_err("%s : Unable to set country code\n", __func__);
qdf_mem_free(reg_info->reg_rules_2g_ptr);
qdf_mem_free(reg_info->reg_rules_5g_ptr);
qdf_mem_free(reg_info);
return QDF_STATUS_E_FAILURE;
}
@@ -2083,6 +2089,10 @@ QDF_STATUS reg_program_default_cc(struct wlan_objmgr_psoc *psoc,
reg_info->offload_enabled = false;
reg_process_master_chan_list(reg_info);
qdf_mem_free(reg_info->reg_rules_2g_ptr);
qdf_mem_free(reg_info->reg_rules_5g_ptr);
qdf_mem_free(reg_info);
return QDF_STATUS_SUCCESS;
}
@@ -2094,13 +2104,6 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc,
uint16_t country_index = -1, regdmn_pair = -1;
QDF_STATUS err;
reg_info = (struct cur_regulatory_info *)qdf_mem_malloc
(sizeof(struct cur_regulatory_info));
if (reg_info == NULL) {
reg_err("reg info is NULL");
return QDF_STATUS_E_FAILURE;
}
soc_reg = (struct wlan_regulatory_psoc_priv_obj *)
wlan_objmgr_psoc_get_comp_private_obj(psoc,
WLAN_UMAC_COMP_REGULATORY);
@@ -2113,6 +2116,13 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc,
if (soc_reg->offload_enabled)
return QDF_STATUS_E_FAILURE;
reg_info = (struct cur_regulatory_info *)qdf_mem_malloc
(sizeof(struct cur_regulatory_info));
if (reg_info == NULL) {
reg_err("reg info is NULL");
return QDF_STATUS_E_FAILURE;
}
reg_info->psoc = psoc;
if (rd->flags == CC_IS_SET) {
@@ -2131,6 +2141,9 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc,
err = reg_get_cur_reginfo(reg_info, country_index, regdmn_pair);
if (err == QDF_STATUS_E_FAILURE) {
reg_err("%s : Unable to set country code\n", __func__);
qdf_mem_free(reg_info->reg_rules_2g_ptr);
qdf_mem_free(reg_info->reg_rules_5g_ptr);
qdf_mem_free(reg_info);
return QDF_STATUS_E_FAILURE;
}
@@ -2145,6 +2158,9 @@ QDF_STATUS reg_program_chan_list(struct wlan_objmgr_psoc *psoc,
reg_info->offload_enabled = false;
reg_process_master_chan_list(reg_info);
qdf_mem_free(reg_info->reg_rules_2g_ptr);
qdf_mem_free(reg_info->reg_rules_5g_ptr);
qdf_mem_free(reg_info);
return QDF_STATUS_SUCCESS;
}