Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a94867c authored by Bala Venkatesh's avatar Bala Venkatesh Committed by nshrivas
Browse files

qcacld-3.0: Avoid memory leaks 

pScanFilter->BSSIDs.numOfBSSIDs is allocated as part
of function csr_neighbor_roam_prepare_scan_profile_filter
and this memory is not freed in error cases.

Hence free the allocated memory of pScanFilter->BSSIDs.numOfBSSIDs
in error cases before returning from function
csr_neighbor_roam_prepare_scan_profile_filter.

Change-Id: I411dba7ead796f84994e633a387730de6ee4d579
CRs-Fixed: 2464822
parent 9e154956

core/sme/src/csr/csr_neighbor_roam.c

+11 −6
Original line number Diff line number Diff line
@@ -396,10 +396,12 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, 
		pScanFilter->SSIDs.SSIDList =

			qdf_mem_malloc(sizeof(tCsrSSIDInfo) *

				pScanFilter->SSIDs.numOfSSIDs);

		if (NULL == pScanFilter->SSIDs.SSIDList) {

			sme_err("Scan Filter SSID mem alloc failed");

		if (!pScanFilter->SSIDs.SSIDList) {

			qdf_mem_free(pScanFilter->BSSIDs.bssid);

			pScanFilter->BSSIDs.bssid = NULL;

			return QDF_STATUS_E_NOMEM;

		}



		for (i = 0; i < roam_params->num_ssid_allowed_list; i++) {

			pScanFilter->SSIDs.SSIDList[i].handoffPermitted = 1;

			pScanFilter->SSIDs.SSIDList[i].ssidHidden = 0;
@@ -415,10 +417,12 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, 
		pScanFilter->SSIDs.numOfSSIDs = 1;

		pScanFilter->SSIDs.SSIDList =

			qdf_mem_malloc(sizeof(tCsrSSIDInfo));

		if (NULL == pScanFilter->SSIDs.SSIDList) {

			sme_err("Scan Filter SSID mem alloc failed");

		if (!pScanFilter->SSIDs.SSIDList) {

			qdf_mem_free(pScanFilter->BSSIDs.bssid);

			pScanFilter->BSSIDs.bssid = NULL;

			return QDF_STATUS_E_NOMEM;

		}



		pScanFilter->SSIDs.SSIDList->handoffPermitted = 1;

		pScanFilter->SSIDs.SSIDList->ssidHidden = 0;

		pScanFilter->SSIDs.SSIDList->SSID.length =
@@ -455,8 +459,9 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, 
		pScanFilter->ChannelInfo.numOfChannels = num_ch;

		pScanFilter->ChannelInfo.ChannelList =

			qdf_mem_malloc(num_ch * sizeof(uint8_t));

		if (NULL == pScanFilter->ChannelInfo.ChannelList) {

			sme_err("Scan Filter Ch list mem alloc failed");

		if (!pScanFilter->ChannelInfo.ChannelList) {

			qdf_mem_free(pScanFilter->BSSIDs.bssid);

			pScanFilter->BSSIDs.bssid = NULL;

			qdf_mem_free(pScanFilter->SSIDs.SSIDList);

			pScanFilter->SSIDs.SSIDList = NULL;

			return QDF_STATUS_E_NOMEM;