Skip to content

Commit a830bdc

Browse files
ahossugregkh
authored andcommitted
staging: rtl8723bs: fix OOB reads in IE loops in issue_assocreq() and join_cmd_hdl()
commit ef61d62 upstream. Two IE parsing loops are missing the header bounds checks before they dereference pIE->length: - issue_assocreq() walks pmlmeinfo->network.ies to build the association request. If the stored IE data ends with only an element_id byte and no length byte, pIE->length is read one byte past the end of the buffer. - join_cmd_hdl() walks pnetwork->ies during station join and has the same problem under the same conditions. Both buffers are filled from AP beacon and probe-response frames, so a malicious AP that sends a truncated final IE can trigger the issue. Apply the two-guard pattern established in update_beacon_info(): 1. Break if fewer than sizeof(*pIE) bytes remain. 2. Break if the IE's declared data extends past the buffer end. Fixes: 554c0a3 ("staging: Add rtl8723bs sdio wifi driver") Cc: stable <stable@kernel.org> Reviewed-by: Luka Gejak <luka.gejak@linux.dev> Signed-off-by: Alexandru Hossu <hossu.alexandru@gmail.com> Link: https://patch.msgid.link/20260522004531.1038924-3-hossu.alexandru@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6dd5e8c commit a830bdc

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,7 +2968,11 @@ void issue_assocreq(struct adapter *padapter)
29682968

29692969
/* vendor specific IE, such as WPA, WMM, WPS */
29702970
for (i = sizeof(struct ndis_802_11_fix_ie); i < pmlmeinfo->network.ie_length;) {
2971+
if (i + sizeof(*pIE) > pmlmeinfo->network.ie_length)
2972+
break;
29712973
pIE = (struct ndis_80211_var_ie *)(pmlmeinfo->network.ies + i);
2974+
if (i + sizeof(*pIE) + pIE->length > pmlmeinfo->network.ie_length)
2975+
break;
29722976

29732977
switch (pIE->element_id) {
29742978
case WLAN_EID_VENDOR_SPECIFIC:
@@ -5373,7 +5377,11 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
53735377

53745378
/* sizeof(struct ndis_802_11_fix_ie) */
53755379
for (i = _FIXED_IE_LENGTH_; i < pnetwork->ie_length;) {
5380+
if (i + sizeof(*pIE) > pnetwork->ie_length)
5381+
break;
53765382
pIE = (struct ndis_80211_var_ie *)(pnetwork->ies + i);
5383+
if (i + sizeof(*pIE) + pIE->length > pnetwork->ie_length)
5384+
break;
53775385

53785386
switch (pIE->element_id) {
53795387
case WLAN_EID_VENDOR_SPECIFIC:/* Get WMM IE. */

0 commit comments

Comments
 (0)