diff options
| author | Max Shi <meixuanshi@google.com> | 2019-04-12 11:59:32 -0700 |
|---|---|---|
| committer | Max Shi <meixuanshi@google.com> | 2019-04-12 11:59:52 -0700 |
| commit | 86c892f3adae7a04ceaad0d99d34fe6f9cd3114e (patch) | |
| tree | d5598831306f27f9e98774070fbb8b09912d00a9 | |
| parent | 03c535b37a77e2710467c09874235f9a879c6266 (diff) | |
| parent | 467f55ca3b662cbac15c5bfbeb6308cfaa6d0c78 (diff) | |
| download | qcacld-86c892f3adae7a04ceaad0d99d34fe6f9cd3114e.tar.gz | |
Merge branch 'android-msm-bluecross-4.9-pi-dr1' into android-msm-bluecross-4.9-pi-qpr1
JUN 2019.2
Bug: 129970703
Change-Id: Id1faae2782e54ed220cb3881bab1f5d43d79c3bb
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) { |