summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMingcheng Zhu <mingchen@qca.qualcomm.com>2013-12-06 01:05:13 -0800
committerPrakash Dhavali <pdhavali@qca.qualcomm.com>2013-12-08 02:47:07 -0800
commitf1d0c3b66720c8df65463396b130363dc3f27f4e (patch)
tree8ffd4ff588b84d63cd4c247db9da8588fba7d290
parent3d501352da158c26d14f808c3b909ed93c75cdd7 (diff)
wlan: qcacld-2.0: Fix some memory leaks
Fix several memory leaks in LIM, wlan_hdd_main, vos_packet and wma modules Change-Id: I2340d91f994ceaa703f5ee637ddc5770ad34857d
-rw-r--r--CORE/CLD_TXRX/TLSHIM/tl_shim.c2
-rw-r--r--CORE/HDD/src/wlan_hdd_main.c4
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c1
-rw-r--r--CORE/SERVICES/WMA/wma.c1
-rw-r--r--CORE/VOSS/src/vos_packet.c2
5 files changed, 6 insertions, 4 deletions
diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
index bf677e21bfeb..c9949d3658a2 100644
--- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c
+++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
@@ -332,7 +332,7 @@ static void tlshim_mgmt_rx_dxe_handler(void *context, adf_nbuf_t buflist)
* that has to be delivered to UMAC
*/
rx_packet =
- (vos_pkt_t *)adf_os_mem_alloc(NULL, sizeof(vos_pkt_t));
+ (vos_pkt_t *)vos_mem_malloc(sizeof(vos_pkt_t));
if(rx_packet == NULL) {
TLSHIM_LOGE("Rx Packet Mem Alloc Failed");
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index d27e4c056a24..031019a5e601 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5222,7 +5222,7 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx)
* it should be freed after PCI remove
*/
adf_ctx = vos_get_context(VOS_MODULE_ID_ADF, pVosContext);
- kfree(adf_ctx);
+ vos_mem_free(adf_ctx);
#endif
/* free the power on lock from platform driver */
@@ -6516,7 +6516,7 @@ static void hdd_driver_exit(void)
* as it is needed in PCI remove. So free it here.
*/
adf_ctx = vos_get_context(VOS_MODULE_ID_ADF, pVosContext);
- kfree(adf_ctx);
+ vos_mem_free(adf_ctx);
#endif
vos_preClose( &pVosContext );
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 92bc64b59f05..5c7fb4ff01b9 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -4925,4 +4925,5 @@ void limProcessRxScanEvent(tpAniSirGlobal pMac, void *buf)
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_DEBUG,
"Received unhandled scan event %lu", pScanEvent->event);
}
+ vos_mem_free(buf);
}
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 31d3929f8d9f..40b2bb4d2376 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -9909,6 +9909,7 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg)
case WDA_UPDATE_CHAN_LIST_REQ:
wma_update_channel_list(wma_handle,
(tSirUpdateChanList *)msg->bodyptr);
+ vos_mem_free(msg->bodyptr);
break;
case WDA_SET_LINK_STATE:
wma_set_linkstate(wma_handle,
diff --git a/CORE/VOSS/src/vos_packet.c b/CORE/VOSS/src/vos_packet.c
index 761590419adb..c010d505801d 100644
--- a/CORE/VOSS/src/vos_packet.c
+++ b/CORE/VOSS/src/vos_packet.c
@@ -69,7 +69,7 @@ VOS_STATUS vos_pkt_return_packet(vos_pkt_t *packet)
adf_nbuf_free(packet->pkt_buf);
/* Free up the Rx packet */
- adf_os_mem_free(packet);
+ vos_mem_free(packet);
return VOS_STATUS_SUCCESS;
}