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

Unverified Commit 660f0d4c authored by Ashish Kumar Dhanotiya's avatar Ashish Kumar Dhanotiya Committed by derfelot
Browse files

qcacld-3.0: Validate assoc response IE len before copy 

When host sends assoc response to supplicant, it
allocates a buffer of fixed size and copies a variable
length of assoc response IEs to this fixed sized buffer.
There is a possibility of OOB write to the allocated buffer
if the assoc response IEs length is greater than the
allocated buffer size.

To avoid above issue validate the assoc response IEs length
with the allocated buffer size before data copy to the buffer.

Change-ID: Ib12385e9ff04e5172ae8b505faf959e426fda439
CRs-Fixed: 2583124
parent 6d065485

drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_assoc.c

+7 −2
Original line number Diff line number Diff line
@@ -2260,8 +2260,9 @@ static void hdd_send_re_assoc_event(struct net_device *dev, 
		goto done;

	}



	if (pCsrRoamInfo->nAssocRspLength == 0) {

		hdd_err("Assoc rsp length is 0");

	if (pCsrRoamInfo->nAssocRspLength < FT_ASSOC_RSP_IES_OFFSET) {

		hdd_err("Invalid assoc rsp length %d",

			pCsrRoamInfo->nAssocRspLength);

		goto done;

	}
@@ -2291,6 +2292,10 @@ static void hdd_send_re_assoc_event(struct net_device *dev, 


	/* Send the Assoc Resp, the supplicant needs this for initial Auth */

	len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;

	if (len > IW_GENERIC_IE_MAX) {

		hdd_err("Invalid Assoc resp length %d", len);

		goto done;

	}

	rspRsnLength = len;

	qdf_mem_copy(rspRsnIe, pFTAssocRsp, len);

	qdf_mem_zero(rspRsnIe + len, IW_GENERIC_IE_MAX - len);