diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-19 18:19:27 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-04-19 18:19:27 +0000 |
| commit | d78301b945d2bfb71ba57263326257e08cb58d53 (patch) | |
| tree | de88cbcd3f5e9d3421561c475ba1e3273195065b | |
| parent | 5c4a4e140b78c9039f613716fca01f2a6aa6920e (diff) | |
| parent | 42f5167a03166b449105aaff1c47d44cc9c044b1 (diff) | |
| download | qcacld-d78301b945d2bfb71ba57263326257e08cb58d53.tar.gz | |
Merge "Merge branch 'android-msm-bluecross-4.9-pi-qpr3' into android-msm-pixel-4.9" into android-msm-pixel-4.9
| -rw-r--r-- | core/mac/src/sys/legacy/src/utils/src/parser_api.c | 4 | ||||
| -rw-r--r-- | core/wma/src/wma_utils.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index fe44364e91..043067e583 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -4616,7 +4616,7 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac, if (addts.num_WMMTCLAS) { j = (uint8_t) (pAddTs->numTclas + addts.num_WMMTCLAS); - if (SIR_MAC_TCLASIE_MAXNUM > j) + if (SIR_MAC_TCLASIE_MAXNUM < j) j = SIR_MAC_TCLASIE_MAXNUM; for (i = pAddTs->numTclas; i < j; ++i) { @@ -4776,7 +4776,7 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, if (addts.num_WMMTCLAS) { j = (uint8_t) (pAddTs->numTclas + addts.num_WMMTCLAS); - if (SIR_MAC_TCLASIE_MAXNUM > j) + if (SIR_MAC_TCLASIE_MAXNUM < j) j = SIR_MAC_TCLASIE_MAXNUM; for (i = pAddTs->numTclas; i < j; ++i) { diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index e61c9d49cb..02eea17fa6 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -1544,6 +1544,15 @@ static int wma_unified_radio_tx_power_level_stats_event_handler(void *handle, fixed_param->radio_id; tx_power_level_values = (uint8_t *) param_tlvs->tx_time_per_power_level; + if (rs_results->total_num_tx_power_levels && + fixed_param->total_num_tx_power_levels > + rs_results->total_num_tx_power_levels) { + WMA_LOGE("%s: excess tx_power buffers:%d, total_num_tx_power_levels:%d", + __func__, fixed_param->total_num_tx_power_levels, + rs_results->total_num_tx_power_levels); + return -EINVAL; + } + rs_results->total_num_tx_power_levels = fixed_param->total_num_tx_power_levels; if (!rs_results->total_num_tx_power_levels) { |