diff options
| author | Max Shi <meixuanshi@google.com> | 2019-04-12 12:02:00 -0700 |
|---|---|---|
| committer | Max Shi <meixuanshi@google.com> | 2019-04-12 12:02:18 -0700 |
| commit | c434d5c7cfefbd0e39b2870eb3b39363aa727a54 (patch) | |
| tree | 051d6298dc814e9e7ac73f81db502bae44cabcba | |
| parent | b740edeae2b531e61c930127d8e85a021fd50082 (diff) | |
| parent | 102380c47935aaf5b3191cba076e035596fd6495 (diff) | |
| download | qcacld-c434d5c7cfefbd0e39b2870eb3b39363aa727a54.tar.gz | |
Merge branch 'android-msm-bluecross-4.9-pi-qpr2' into android-msm-bluecross-4.9-pi-qpr3
JUN 2019.4
Bug: 129970703
Change-Id: Iab40fac35237eee592a455a979db7d9835cee179
Signed-off-by: Max Shi <meixuanshi@google.com>
| -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 c201226a70..a6ed2f6ba0 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) { |