qcacld-3.0: Validate number of requested EIDs in beacon request
If the requested info field in beacon report request is present,
the driver tries to allocate memory for the target beacon report
EIDs from the number of requested EIDs received from the frame.
Since the number of requested EIDs is directly controlled by the
frame sent by AP, validate this value before using it to allocate
memory.
Bug: 144843138
Change-Id: Icbac3e952de0d7ae3144e9b319f2c51ccdf93ac5
CRs-Fixed: 2571480
Signed-off-by: Sunil Ravi <sunilravi@google.com>
diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c
index 6c351e8..a1f2586 100644
--- a/core/mac/src/pe/rrm/rrm_api.c
+++ b/core/mac/src/pe/rrm/rrm_api.c
@@ -570,6 +570,11 @@
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 @@
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 @@
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) {
