diff options
| author | Houston Hoffman <hhoffman@codeaurora.org> | 2016-11-12 19:14:38 -0800 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-15 02:18:06 -0800 |
| commit | e9c3dfbd73d4393f34ff5b1fca56b6b14d94f0a8 (patch) | |
| tree | 72fee0a209303bb14de19917381eea252ea8c5bc | |
| parent | 06a858637ada9e0db1400ce1ec27045587a76fc8 (diff) | |
qcacld-3.0: Fix memory leaks when cds_open fails
When cds_open fails, several cleanup actions are missed.
cds_shutdown_notifier_purge
hdd_green_ap_deinit
wlan_hdd_deinit_tx_rx_histogram
Change-Id: I9812b26636b1fd82320de323538777ac048ea824
CRs-Fixed: 1089946
| -rw-r--r-- | core/cds/src/cds_api.c | 1 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index ff84def298ec..4475b5751480 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -422,6 +422,7 @@ err_bmi_close: err_sched_close: cds_sched_close(gp_cds_context); + cds_shutdown_notifier_purge(); err_concurrency_lock: qdf_mutex_destroy(&cds_ctx->qdf_conc_list_lock); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f126f65f2e84..4ec62ecfba51 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -8174,10 +8174,12 @@ err_stop_modules: } err_exit_nl_srv: + hdd_green_ap_deinit(hdd_ctx); hdd_exit_netlink_services(hdd_ctx); cds_deinit_ini_config(); err_hdd_free_context: + wlan_hdd_deinit_tx_rx_histogram(hdd_ctx); qdf_mc_timer_destroy(&hdd_ctx->iface_change_timer); mutex_destroy(&hdd_ctx->iface_change_lock); hdd_context_destroy(hdd_ctx); |