Skip to content

Commit

Permalink
staging: rtl8712: Fix possible buffer overflow in r8712_sitesurvey_cmd
Browse files Browse the repository at this point in the history
commit b93c1e3 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>
  • Loading branch information
lgtux authored and gregkh committed Mar 17, 2021
1 parent 85bd010 commit 1a1642a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/rtl8712/rtl871x_cmd.c
Expand Up @@ -192,8 +192,10 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
psurveyPara->ss_ssidlen = 0;
memset(psurveyPara->ss_ssid, 0, IW_ESSID_MAX_SIZE + 1);
if (pssid && 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);
Expand Down

0 comments on commit 1a1642a

Please sign in to comment.