Skip to content

Commit a752816

Browse files
MocLGgregkh
authored andcommitted
staging: rtl8723bs: fix potential out-of-bounds read in rtw_restruct_wmm_ie
The current code checks 'i + 5 < in_len' at the end of the if statement. However, it accesses 'in_ie[i + 5]' before that check, which can lead to an out-of-bounds read. Move the length check to the beginning of the conditional to ensure the index is within bounds before accessing the array. Fixes: 554c0a3 ("staging: Add rtl8723bs sdio wifi driver") Cc: stable <stable@kernel.org> Signed-off-by: Luka Gejak <luka.gejak@linux.dev> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20260224132647.11642-2-luka.gejak@linux.dev Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f0109b9 commit a752816

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/staging/rtl8723bs/core/rtw_mlme.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,10 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
19881988
while (i < in_len) {
19891989
ielength = initial_out_len;
19901990

1991-
if (in_ie[i] == 0xDD && in_ie[i + 2] == 0x00 && in_ie[i + 3] == 0x50 && in_ie[i + 4] == 0xF2 && in_ie[i + 5] == 0x02 && i + 5 < in_len) { /* WMM element ID and OUI */
1991+
if (i + 5 < in_len &&
1992+
in_ie[i] == 0xDD && in_ie[i + 2] == 0x00 &&
1993+
in_ie[i + 3] == 0x50 && in_ie[i + 4] == 0xF2 &&
1994+
in_ie[i + 5] == 0x02) {
19921995
for (j = i; j < i + 9; j++) {
19931996
out_ie[ielength] = in_ie[j];
19941997
ielength++;

0 commit comments

Comments
 (0)