diff options
| author | SecurityBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2019-11-22 14:12:09 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2019-11-22 14:12:10 -0800 |
| commit | 6103c13e8917fe3a8d7cb3f0f8ed882b5fb2ed96 (patch) | |
| tree | 98ef5038075dea4522a4377800e7ad0bab461481 | |
| parent | 395c752bcb965db80a8d6b296f31150b05c99670 (diff) | |
| parent | f8f6cc6cfc95261f411d5538b38d79838304b2db (diff) | |
| download | qcacld-6103c13e8917fe3a8d7cb3f0f8ed882b5fb2ed96.tar.gz | |
Merge android-msm-pixel-4.9-qt-qpr2 into android-msm-pixel-4.9
SBMerger: 279089054
Change-Id: I614beadbc81f6ef0a6ecff39deacc02be07d930c
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | core/mac/src/pe/rrm/rrm_api.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 6c351e8d13..a1f2586feb 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -570,6 +570,11 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, reportingDetail : BEACON_REPORTING_DETAIL_ALL_FF_IE; if (pBeaconReq->measurement_request.Beacon.RequestedInfo.present) { + if (!pBeaconReq->measurement_request.Beacon.RequestedInfo. + num_requested_eids) { + pe_debug("802.11k BCN RPT: Requested num of EID is 0"); + return eRRM_FAILURE; + } pCurrentReq->request.Beacon.reqIes.pElementIds = qdf_mem_malloc(sizeof(uint8_t) * pBeaconReq->measurement_request.Beacon. @@ -578,6 +583,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, pe_err("Unable to allocate memory for request IEs buffer"); return eRRM_FAILURE; } + pCurrentReq->request.Beacon.reqIes.num = pBeaconReq->measurement_request.Beacon.RequestedInfo. num_requested_eids; @@ -585,6 +591,11 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, pBeaconReq->measurement_request.Beacon. RequestedInfo.requested_eids, pCurrentReq->request.Beacon.reqIes.num); + pe_debug("802.11k BCN RPT: Requested EIDs: num:[%d]", + pCurrentReq->request.Beacon.reqIes.num); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + pCurrentReq->request.Beacon.reqIes.pElementIds, + pCurrentReq->request.Beacon.reqIes.num); } if (pBeaconReq->measurement_request.Beacon.num_APChannelReport) { |