commit df63f449b9a5ced443433a517d017f4b489b2db8
author Sarick Jiang <sarick.jiang@mediatek.com> Fri Apr 14 16:59:32 2017 +0800
committer Sarick Jiang <sarick.jiang@mediatek.com> Mon Apr 17 19:35:13 2017 +0800
tree 3fad1582fa86a5810a673dd6bcd3aa167c065e44
parent 61f6c6ce2347c6f38fdfddfebd79fe89713245a7

[WCNCR00144638] regd: Fix crash problem of TxPwrLimit when in single band

[Description]
Fix crash problem caused by TxPwrLimit when setting to a country
that has only single band capability.

Feature: regd
Change-Id: I21ca3b72bd8af6d57388367fa46d8cb6eb3b7935
Signed-off-by: Sarick Jiang <sarick.jiang@mediatek.com>
CR-Id: WCNCR00144638

mgmt/rlm_domain.c

diff --git a/mgmt/rlm_domain.c b/mgmt/rlm_domain.c
index 1e04bec..7ac6db4 100644
--- a/mgmt/rlm_domain.c
+++ b/mgmt/rlm_domain.c
@@ -1833,6 +1833,11 @@
 	P_CMD_CHANNEL_POWER_LIMIT_V2 pCmd = NULL;
 	P_CHANNEL_TX_PWR_LIMIT pChTxPwrLimit = NULL;
 
+	if (!pSetCmd || !pTxPwrLimit) {
+		DBGLOG(RLM, ERROR, "%s: Invalid request!!!\n", __func__);
+		return;
+	}
+
 	for (ucIdx = 0; ucIdx < pSetCmd->ucNum; ucIdx++) {
 		pCmd = &(pSetCmd->rChannelPowerLimit[ucIdx]);
 		cChIdx = rlmDomainTxPwrLimitGetChIdx(pTxPwrLimit, pCmd->ucCentralCh);
@@ -1910,7 +1915,7 @@
 		return bRet;
 	}
 
-	pTxPwrLimit->ucChNum = pSetCmd_2g->ucNum + pSetCmd_5g->ucNum;
+	pTxPwrLimit->ucChNum = (pSetCmd_2g ? pSetCmd_2g->ucNum : 0) + (pSetCmd_5g ? pSetCmd_5g->ucNum : 0);
 
 	pTxPwrLimit->rChannelTxPwrLimit =
 		(P_CHANNEL_TX_PWR_LIMIT) kalMemAlloc(sizeof(CHANNEL_TX_PWR_LIMIT) *
@@ -1922,17 +1927,19 @@
 		goto error;
 	}
 
-	for (ucIdx = 0; ucIdx < pSetCmd_2g->ucNum; ucIdx++) {
-		pTxPwrLimit->rChannelTxPwrLimit[ucCnt].ucChannel =
-			pSetCmd_2g->rChannelPowerLimit[ucIdx].ucCentralCh;
-		ucCnt++;
-	}
+	if (pSetCmd_2g)
+		for (ucIdx = 0; ucIdx < pSetCmd_2g->ucNum; ucIdx++) {
+			pTxPwrLimit->rChannelTxPwrLimit[ucCnt].ucChannel =
+				pSetCmd_2g->rChannelPowerLimit[ucIdx].ucCentralCh;
+			ucCnt++;
+		}
 
-	for (ucIdx = 0; ucIdx < pSetCmd_5g->ucNum; ucIdx++) {
-		pTxPwrLimit->rChannelTxPwrLimit[ucCnt].ucChannel =
-			pSetCmd_5g->rChannelPowerLimit[ucIdx].ucCentralCh;
-		ucCnt++;
-	}
+	if (pSetCmd_5g)
+		for (ucIdx = 0; ucIdx < pSetCmd_5g->ucNum; ucIdx++) {
+			pTxPwrLimit->rChannelTxPwrLimit[ucCnt].ucChannel =
+				pSetCmd_5g->rChannelPowerLimit[ucIdx].ucCentralCh;
+			ucCnt++;
+		}
 
 	bRet = rlmDomainTxPwrLimitLoadFromFile(prGlueInfo->prAdapter,
 		country_code, pTxPwrLimit);