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

Commit e7e1b1d1 authored by Lee Gibson's avatar Lee Gibson Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Fix possible buffer overflow in r8712_sitesurvey_cmd 



commit b93c1e3981af19527beee1c10a2bef67a228c48c upstream.

Function r8712_sitesurvey_cmd calls memcpy without checking the length.
A user could control that length and trigger a buffer overflow.
Fix by checking the length is within the maximum allowed size.

Signed-off-by: default avatarLee Gibson <leegib@gmail.com>
Link: https://lore.kernel.org/r/20210301132648.420296-1-leegib@gmail.com


Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea5287d8

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −2
Original line number Diff line number Diff line
@@ -239,8 +239,10 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter, 
	psurveyPara->ss_ssidlen = 0;

	memset(psurveyPara->ss_ssid, 0, IW_ESSID_MAX_SIZE + 1);

	if ((pssid != NULL) && (pssid->SsidLength)) {

		memcpy(psurveyPara->ss_ssid, pssid->Ssid, pssid->SsidLength);

		psurveyPara->ss_ssidlen = cpu_to_le32(pssid->SsidLength);

		int len = min_t(int, pssid->SsidLength, IW_ESSID_MAX_SIZE);



		memcpy(psurveyPara->ss_ssid, pssid->Ssid, len);

		psurveyPara->ss_ssidlen = cpu_to_le32(len);

	}

	set_fwstate(pmlmepriv, _FW_UNDER_SURVEY);

	r8712_enqueue_cmd(pcmdpriv, ph2c);