diff options
| author | Wu Gao <wugao@codeaurora.org> | 2016-10-27 16:30:48 +0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-11-07 12:26:52 +0530 |
| commit | ce3d9e7343305de95123b23cd3081d401a661b5d (patch) | |
| tree | 1113f6c015ae402184314087cd9d0b6fe0f2e17f | |
| parent | ca670fc79b7b34426990bc48292abdb0fdd6a6ec (diff) | |
qcacld-2.0: Fix memory leak during wlan driver startup
Deactivate logging code path may be by-passed when handling the nlink
service initialization failure
Change-Id: I55e30b7afe6d30a91d61fad20f8bbbf27b72cc1e
CRs-Fixed: 1082925
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 17294ba5caf3..af3272fbf2c5 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -15054,7 +15054,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) /* Initialize the nlink service */ if (wlan_hdd_nl_init(pHddCtx) != 0) { hddLog(LOGP, FL("nl_srv_init failed")); - goto err_sock_activate; + goto err_logging_sock; } vos_set_radio_index(pHddCtx->radio_index); @@ -15894,11 +15894,13 @@ err_free_ftm_open: #endif } - if (VOS_FTM_MODE != hdd_get_conparam()) - wlan_hdd_logging_sock_deactivate_svc(pHddCtx); err_nl_srv: nl_srv_exit(); +err_logging_sock: + if (VOS_FTM_MODE != hdd_get_conparam()) + wlan_hdd_logging_sock_deactivate_svc(pHddCtx); + err_sock_activate: wlan_hdd_cfg80211_deinit(wiphy); |