Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb422f1 authored by Jianmin Zhu's avatar Jianmin Zhu Committed by Gerrit - the friendly Code Review server
Browse files

qcacld-3.0: Avoid possible array OOB 

Add bound check before access array to avoid out of bound issue.
Separate array bound and duplicate check of 11a and 11b since they have
different length and type.

Change-Id: Icb9382cd42385339532518759de0f6137c5203bd
CRs-Fixed: 3051517
parent bd655e5f

core/mac/src/pe/lim/lim_assoc_utils.c

+27 −25
Original line number Diff line number Diff line
@@ -1550,7 +1550,7 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, 
{

	tSirMacRateSet tempRateSet;

	tSirMacRateSet tempRateSet2;

	uint32_t i, j, val, min, isArate = 0;

	uint32_t i, j, val, min;

	qdf_size_t val_len;

	uint8_t aRateIndex = 0;

	uint8_t bRateIndex = 0;
@@ -1614,22 +1614,6 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, 
				min = j;

			}

		}

		if (sirIsArate(tempRateSet.rate[min] & 0x7f)) {

			isArate = 1;

		} else if (sirIsBrate(tempRateSet.rate[min] & 0x7f)) {

			isArate = 0;

		} else {

			pe_debug("%d is neither 11a nor 11b rate",

				 tempRateSet.rate[min]);

			tempRateSet.rate[min] = 0xff;

			continue;

		}

		if (tempRateSet.rate[min] == pRates->llaRates[aRateIndex] ||

		    tempRateSet.rate[min] == pRates->llbRates[bRateIndex]) {

			pe_debug("Duplicate rate: %d", tempRateSet.rate[min]);

			tempRateSet.rate[min] = 0xff;

			continue;

		}

		/*

		 * HAL needs to know whether the rate is basic rate or not,

		 * as it needs to update the response rate table accordingly.
@@ -1638,15 +1622,33 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, 
		 * response rate table whenever basic rate set is changed.

		 */

		if (basicOnly && !(tempRateSet.rate[min] & 0x80)) {

			tempRateSet.rate[min] = 0xff;

			continue;

		}

		if (isArate && aRateIndex < SIR_NUM_11A_RATES)

			pe_debug("Invalid basic rate");

		} else if (sirIsArate(tempRateSet.rate[min] & 0x7f)) {

			if (aRateIndex >= SIR_NUM_11A_RATES) {

				pe_debug("OOB, aRateIndex: %d", aRateIndex);

			} else if (aRateIndex >= 1 && (tempRateSet.rate[min] ==

				   pRates->llaRates[aRateIndex - 1])) {

				pe_debug("Duplicate 11a rate: %d",

					 tempRateSet.rate[min]);

			} else {

				pRates->llaRates[aRateIndex++] =

						tempRateSet.rate[min];

		else if (bRateIndex < SIR_NUM_11B_RATES)

			}

		} else if (sirIsBrate(tempRateSet.rate[min] & 0x7f)) {

			if (bRateIndex >= SIR_NUM_11B_RATES) {

				pe_debug("OOB, bRateIndex: %d", bRateIndex);

			} else if (bRateIndex >= 1 && (tempRateSet.rate[min] ==

				   pRates->llbRates[bRateIndex - 1])) {

				pe_debug("Duplicate 11b rate: %d",

					 tempRateSet.rate[min]);

			} else {

				pRates->llbRates[bRateIndex++] =

						tempRateSet.rate[min];

			}

		} else {

			pe_debug("%d is neither 11a nor 11b rate",

				 tempRateSet.rate[min]);

		}

		tempRateSet.rate[min] = 0xff;

	}