浏览代码

Merge "qcacld-3.0: Dont send beacon report on invalid measure duration" into wlan-cld3.driver.lnx.2.0

CNSS_WLAN Service 6 年之前
父节点
当前提交
bdeafad677
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      core/mac/src/pe/rrm/rrm_api.c

+ 7 - 0
core/mac/src/pe/rrm/rrm_api.c

@@ -524,6 +524,13 @@ rrm_process_beacon_report_req(struct mac_context *mac,
 	pe_info("maxDuration = %d sign = %d maxMeasduration = %d measDuration = %d",
 		maxDuration, sign, maxMeasduration, measDuration);
 
+	if (measDuration == 0 &&
+	    pBeaconReq->measurement_request.Beacon.meas_mode !=
+	    eSIR_BEACON_TABLE) {
+		pe_err("Invalid measurement duration");
+		return eRRM_REFUSED;
+	}
+
 	if (maxMeasduration < measDuration) {
 		if (pBeaconReq->durationMandatory) {
 			pe_err("Dropping the request: duration mandatory and maxduration > measduration");