samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Create psoc in hdd_context_create just after cfg_parse

Browse Source 
HDD config params are getting used before creating and storing psoc
in hdd context which may cause NULL pointer dereference of psoc.

To mitigate this create psoc and parse cfg ini params just after
cfg_parse() in hdd_context_create().

Change-Id: Ida2b81eef0ebbfba2749ca89b63980201830a5e2
CRs-Fixed: 2321959
This commit is contained in:
Dundi Raviteja
2018-09-25 12:16:03 +05:30
committed by nshrivas
parent 1111aa3d6a
commit fb9357aa38
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/hdd/src/wlan_hdd_main.c
View File

@@ -9197,6 +9197,13 @@ static struct hdd_context *hdd_context_create(struct device *dev)
hdd_err("Failed to parse cfg %s; status:%d\n", hdd_err("Failed to parse cfg %s; status:%d\n",
WLAN_INI_FILE, status); WLAN_INI_FILE, status);
ret = hdd_objmgr_create_and_store_psoc(hdd_ctx, DEFAULT_PSOC_ID);
if (ret) {
hdd_err("Psoc creation fails!");
QDF_BUG(0);
goto err_free_config;
}
ie_whitelist_attrs_init(hdd_ctx); ie_whitelist_attrs_init(hdd_ctx);
hdd_debug("setting timer multiplier: %u", hdd_debug("setting timer multiplier: %u",
@@ -9214,7 +9221,7 @@ static struct hdd_context *hdd_context_create(struct device *dev)
ret = hdd_context_init(hdd_ctx); ret = hdd_context_init(hdd_ctx);
if (ret) if (ret)
goto err_free_config; goto err_hdd_objmgr_destroy;
/* Uses to enabled logging after SSR */ /* Uses to enabled logging after SSR */
hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log; hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log;
@@ -9249,6 +9256,9 @@ err_deinit_txrx_histogram:
err_deinit_hdd_context: err_deinit_hdd_context:
hdd_context_deinit(hdd_ctx); hdd_context_deinit(hdd_ctx);
err_hdd_objmgr_destroy:
hdd_objmgr_release_and_destroy_psoc(hdd_ctx);
err_free_config: err_free_config:
qdf_mem_free(hdd_ctx->config); qdf_mem_free(hdd_ctx->config);
@@ -11405,7 +11415,6 @@ int hdd_wlan_startup(struct device *dev)
{ {
QDF_STATUS status; QDF_STATUS status;
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
struct wlan_objmgr_psoc *psoc;
int ret; int ret;
bool rtnl_held; bool rtnl_held;
mac_handle_t mac_handle; mac_handle_t mac_handle;
@@ -11417,16 +11426,7 @@ int hdd_wlan_startup(struct device *dev)
if (IS_ERR(hdd_ctx)) if (IS_ERR(hdd_ctx))
return PTR_ERR(hdd_ctx); return PTR_ERR(hdd_ctx);
ret = hdd_objmgr_create_and_store_psoc(hdd_ctx,
DEFAULT_PSOC_ID);
if (ret) {
hdd_err("Psoc creation fails!");
QDF_BUG(0);
goto err_hdd_free_context;
}
hdd_action_oui_config(hdd_ctx); hdd_action_oui_config(hdd_ctx);
psoc = hdd_ctx->psoc;
qdf_nbuf_init_replenish_timer(); qdf_nbuf_init_replenish_timer();
@@ -11558,8 +11558,6 @@ err_memdump_deinit:
osif_request_manager_deinit(); osif_request_manager_deinit();
hdd_exit_netlink_services(hdd_ctx); hdd_exit_netlink_services(hdd_ctx);
hdd_objmgr_release_and_destroy_psoc(hdd_ctx);
err_hdd_free_context: err_hdd_free_context:
if (cds_is_fw_down()) if (cds_is_fw_down())
hdd_err("Not setting the complete event as fw is down"); hdd_err("Not setting the complete event as fw is down");