mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
staging: rtl8712: Fix possible buffer overflow in r8712_sitesurvey_cmd
commit b93c1e3981
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: Lee 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ea5287d887
commit
e7e1b1d1b6
1 changed files with 4 additions and 2 deletions
|
@ -239,8 +239,10 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
|
||||||
psurveyPara->ss_ssidlen = 0;
|
psurveyPara->ss_ssidlen = 0;
|
||||||
memset(psurveyPara->ss_ssid, 0, IW_ESSID_MAX_SIZE + 1);
|
memset(psurveyPara->ss_ssid, 0, IW_ESSID_MAX_SIZE + 1);
|
||||||
if ((pssid != NULL) && (pssid->SsidLength)) {
|
if ((pssid != NULL) && (pssid->SsidLength)) {
|
||||||
memcpy(psurveyPara->ss_ssid, pssid->Ssid, pssid->SsidLength);
|
int len = min_t(int, pssid->SsidLength, IW_ESSID_MAX_SIZE);
|
||||||
psurveyPara->ss_ssidlen = cpu_to_le32(pssid->SsidLength);
|
|
||||||
|
memcpy(psurveyPara->ss_ssid, pssid->Ssid, len);
|
||||||
|
psurveyPara->ss_ssidlen = cpu_to_le32(len);
|
||||||
}
|
}
|
||||||
set_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
|
set_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
|
||||||
r8712_enqueue_cmd(pcmdpriv, ph2c);
|
r8712_enqueue_cmd(pcmdpriv, ph2c);
|
||||||
|
|
Loading…
Reference in a new issue