staging: rtl8723bs: fix multiple missing bounds checks
v3 cover staging: rtl8723bs: fix multiple missing bounds checks
This series fixes five missing bounds checks in the rtl8723bs driver that can be triggered by malformed WiFi frames. Each patch addresses one function and is independent of the others, but they are sent as a series since they all modify the same driver.
All patches are based on staging-next, pass checkpatch with no errors or warnings, and compile cleanly. Found by reviewing the 40 memcpy calls in rtw_recv.c and tracing buffer pointer manipulation through the inline helpers in rtw_recv.h. Not tested on hardware.
Changes since v2:
- Rebased on staging-next
- Sent as a numbered series instead of individual patches
- Added proper Cc list from get_maintainer.pl
Delene Tchio Romuald (5):
staging: rtl8723bs: fix heap buffer overflow in recvframe_defrag()
staging: rtl8723bs: fix integer underflow in TKIP MIC verification
staging: rtl8723bs: fix out-of-bounds read in portctrl()
staging: rtl8723bs: fix out-of-bounds reads in IE parsing functions
staging: rtl8723bs: fix negative length in WEP decryption
.../staging/rtl8723bs/core/rtw_ieee80211.c | 15 +++++-- drivers/staging/rtl8723bs/core/rtw_recv.c | 43 ++++++++++++++----- drivers/staging/rtl8723bs/core/rtw_security.c | 6 +++ 3 files changed, 50 insertions(+), 14 deletions(-)
Signature · 1 line
2.43.0
PATCH v3 1/5 staging: rtl8723bs: fix heap buffer overflow in recvframe_defrag()
In recvframe_defrag(), a memcpy() copies fragment data into the reassembly buffer before recvframe_put() validates that the buffer has sufficient space. If the total reassembled payload exceeds the receive buffer capacity, this results in a heap buffer overflow.
An attacker within WiFi radio range can exploit this by sending crafted 802.11 fragmented frames. No authentication is required.
Add a bounds check before the memcpy() to verify that the fragment payload fits within the remaining buffer space, using the same error handling pattern already present in the function.
Found by reviewing memory operations in the driver and tracing buffer pointer manipulation through rtw_recv.h inline helpers. Not tested on hardware.
---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 was based on v7.0-rc6 and did not apply)
- Removed Cc: stable (will be added by maintainer)
drivers/staging/rtl8723bs/core/rtw_recv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +7 -1
@@ -1132,7 +1132,13 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,/* append to first fragment frame's tail (if privacy frame, pull the ICV) */ recvframe_pull_tail (prframe, pfhdr->attrib.icv_len); -/* memcpy */ +/* Verify the receiving buffer has enough space for the fragment */ +if (pnfhdr->len > (uint)(pfhdr->rx_end - pfhdr->rx_tail)) { +rtw_free_recvframe (prframe, pfree_recv_queue); +rtw_free_recvframe_queue (defrag_q, pfree_recv_queue); +return NULL ; + } +memcpy (pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);recvframe_put (prframe, pnfhdr->len);
Signature · 1 line
2.43.0
Re: [PATCH v3 1/5] staging: rtl8723bs: fix heap buffer overflow in recvframe_defrag()
Quoted 37 lines · Delene Tchio Romuald
In
recvframe_defrag(), amemcpy()copies fragment data into the reassembly buffer beforerecvframe_put()validates that the buffer has sufficient space. If the total reassembled payload exceeds the receive buffer capacity, this results in a heap buffer overflow.An attacker within WiFi radio range can exploit this by sending crafted 802.11 fragmented frames. No authentication is required.
Add a bounds check before the
memcpy()to verify that the fragment payload fits within the remaining buffer space, using the same error handling pattern already present in the function.Found by reviewing memory operations in the driver and tracing buffer pointer manipulation through
rtw_recv.hinline helpers. Not tested on hardware.Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 was based on v7.0-rc6 and did not apply)
- Removed Cc: stable (will be added by maintainer)drivers/staging/rtl8723bs/core/rtw_recv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/staging/rtl8723bs/core/rtw_recv.c +0
-1@@ -1132,7 +1132,13 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,/* append to first fragment frame's tail (if privacy frame, pull the ICV) */ recvframe_pull_tail (prframe, pfhdr->attrib.icv_len); -/* memcpy */
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_defrag(struct adapter *adapter, · line 1144
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +7
-0+/* Verify the receiving buffer has enough space for the fragment */ +if (pnfhdr->len > (uint)(pfhdr->rx_end - pfhdr->rx_tail)) { +rtw_free_recvframe (prframe, pfree_recv_queue); +rtw_free_recvframe_queue (defrag_q, pfree_recv_queue); +return NULL ; + } +memcpy (pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);recvframe_put (prframe, pnfhdr->len);
LGTM.
Best regards,
Luka Gejak
Re: [PATCH v3 1/5] staging: rtl8723bs: fix heap buffer overflow in recvframe_defrag()
In reply to Delene Tchio RomualdQuoted 16 lines · Delene Tchio Romuald
In
recvframe_defrag(), amemcpy()copies fragment data into the reassembly buffer beforerecvframe_put()validates that the buffer has sufficient space. If the total reassembled payload exceeds the receive buffer capacity, this results in a heap buffer overflow.An attacker within WiFi radio range can exploit this by sending crafted 802.11 fragmented frames. No authentication is required.
Add a bounds check before the
memcpy()to verify that the fragment payload fits within the remaining buffer space, using the same error handling pattern already present in the function.Found by reviewing memory operations in the driver and tracing buffer pointer manipulation through
rtw_recv.hinline helpers. Not tested on hardware.
Quoted 8 lines
Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 was based on v7.0-rc6 and did not apply)
- Removed Cc: stable (will be added by maintainer)
Wait, what? That used to be a thing in net, I don't know if it still is a rule there but so far as I know, it's not a rule in staging.
I made checkpatch complain if you CC stable but you don't have a Fixes tag. Could that be what you're talking about? A bunch of people have asked for Fixes tags on these patches as well. Please, do that? :P
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_defrag(struct adapter *adapter, · line 1133
Quoted 11 lines
drivers/staging/rtl8723bs/core/rtw_recv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/staging/rtl8723bs/core/rtw_recv.c +0
-0@@ -1132,7 +1132,13 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,/* append to first fragment frame's tail (if privacy frame, pull the ICV) */ recvframe_pull_tail (prframe, pfhdr->attrib.icv_len);
There is no error checking on these pull calls. They're supposed to return NULL if pfhdr->attrib.icv_len is too big. (There is a similar caller earlier on the line before).
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_defrag(struct adapter *adapter, · line 1136
Quoted 4 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +2
-1-/* memcpy */ +/* Verify the receiving buffer has enough space for the fragment */ +if (pnfhdr->len > (uint)(pfhdr->rx_end - pfhdr->rx_tail)) {
Remove the unnecessary cast.
Otherwise it looks good to me.
regards,
dan carpenter
Quoted 11 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +5
-0+rtw_free_recvframe (prframe, pfree_recv_queue); +rtw_free_recvframe_queue (defrag_q, pfree_recv_queue); +return NULL ; + } +memcpy (pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);recvframe_put (prframe, pnfhdr->len);Signature · 1 line
2.43.0
Re: [PATCH v3 1/5] staging: rtl8723bs: fix heap buffer overflow in recvframe_defrag()
Quoted 12 lines · Dan Carpenter
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_defrag(struct adapter *adapter, · line 1133
Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +0
-0@@ -1132,7 +1132,13 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,/* append to first fragment frame's tail (if privacy frame, pull the ICV) */ recvframe_pull_tail (prframe, pfhdr->attrib.icv_len);There is no error checking on these pull calls. They're supposed to return NULL if
pfhdr->attrib.icv_lenis too big. (There is a similar caller earlier on the line before).
Actually if these fail
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_defrag(struct adapter *adapter, · line 1136
Quoted 4 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +2
-1-/* memcpy */ +/* Verify the receiving buffer has enough space for the fragment */ +if (pnfhdr->len > (uint)(pfhdr->rx_end - pfhdr->rx_tail)) {
then the pfhdr->rx_end and pfhdr->rx_tail pointers are wrong. So you really do need to add the error checking before you do the resend.
regards,
dan carpenter
PATCH v3 2/5 staging: rtl8723bs: fix integer underflow in TKIP MIC verification
In reply to Delene Tchio RomualdIn recvframe_chkmic(), datalen is computed as:
datalen = len - hdrlen - iv_len - icv_len - 8;
All operands are unsigned, so if the frame is shorter than the sum of header, IV, ICV, and MIC lengths, the subtraction wraps to a very large value. This corrupted datalen is then passed to rtw_seccalctkipmic() and used as a pointer offset, leading to out-of-bounds reads on kernel heap memory.
Add a minimum frame length check before the subtraction to prevent the unsigned integer underflow.
Found by reviewing memory operations in the driver. Not tested on hardware.
---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 did not apply due to whitespace changes)
drivers/staging/rtl8723bs/core/rtw_recv.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/staging/rtl8723bs/core/rtw_recv.c +7 -0
@@ -390,6 +390,13 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p mickey = &stainfo->dot11tkiprxmickey.skey[0 ]; } +/* Ensure the frame is large enough for TKIP MIC verification */ +if (precvframe->u.hdr.len <= prxattrib->hdrlen + + prxattrib->iv_len + prxattrib->icv_len +8 ) { + res = _FAIL; + goto exit; + } + datalen = precvframe->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len - prxattrib->icv_len -8 ;/* icv_len included the mic code */ pframe = precvframe->u.hdr.rx_data; payload = pframe + prxattrib->hdrlen + prxattrib->iv_len;
Signature · 1 line
2.43.0
Re: [PATCH v3 2/5] staging: rtl8723bs: fix integer underflow in TKIP MIC verification
Quoted 35 lines · Delene Tchio Romuald
In
recvframe_chkmic(), datalen is computed as:datalen = len - hdrlen - iv_len - icv_len - 8;All operands are unsigned, so if the frame is shorter than the sum of header, IV, ICV, and MIC lengths, the subtraction wraps to a very large value. This corrupted datalen is then passed to
rtw_seccalctkipmic()and used as a pointer offset, leading to out-of-bounds reads on kernel heap memory.Add a minimum frame length check before the subtraction to prevent the unsigned integer underflow.
Found by reviewing memory operations in the driver. Not tested on hardware.
Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 did not apply due to whitespace changes)drivers/staging/rtl8723bs/core/rtw_recv.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/staging/rtl8723bs/core/rtw_recv.c +0
-0@@ -390,6 +390,13 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p mickey = &stainfo->dot11tkiprxmickey.skey[0 ]; }
drivers/staging/rtl8723bs/core/rtw_recv.c static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p · line 402
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +7
-0+/* Ensure the frame is large enough for TKIP MIC verification */ +if (precvframe->u.hdr.len <= prxattrib->hdrlen + + prxattrib->iv_len + prxattrib->icv_len +8 ) { + res = _FAIL; + goto exit; + } + datalen = precvframe->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len - prxattrib->icv_len -8 ;/* icv_len included the mic code */ pframe = precvframe->u.hdr.rx_data; payload = pframe + prxattrib->hdrlen + prxattrib->iv_len;
LGTM.
Best regards,
Luka Gejak
PATCH v3 3/5 staging: rtl8723bs: fix out-of-bounds read in portctrl()
In reply to Delene Tchio RomualdIn portctrl(), the pointer is advanced by hdrlen + iv_len + LLC_HEADER_LENGTH and then 2 bytes are read via memcpy() to extract the ether_type field. There is no check that the frame is large enough to contain these fields, so a short frame leads to an out-of-bounds read on kernel heap memory.
This code is reachable during 802.1X authentication when the station is in the ieee8021x_blocked state.
Add a frame length check before the pointer arithmetic and wrap the existing ether_type extraction in the else branch so that short frames are dropped safely.
Found by reviewing memory operations in the driver. Not tested on hardware.
---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next
drivers/staging/rtl8723bs/core/rtw_recv.c | 28 +++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +18 -10
@@ -539,17 +539,25 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre prtnframe = precv_frame; -/* get ether_type */ - ptr = ptr + pfhdr->attrib.hdrlen + pfhdr->attrib.iv_len +LLC_HEADER_LENGTH ; -memcpy (&be_tmp, ptr,2 ); - ether_type =ntohs (be_tmp); - -if (ether_type == eapol_type) - prtnframe = precv_frame; -else { -/* free this frame */ -rtw_free_recvframe (precv_frame, &adapter->recvpriv.free_recv_queue); +/* Ensure frame has LLC header and ether_type */ +if (pfhdr->len < pattrib->hdrlen + + pattrib->iv_len +LLC_HEADER_LENGTH +2 ) { +rtw_free_recvframe (precv_frame, + &adapter->recvpriv.free_recv_queue); prtnframe =NULL ; + }else { +/* get ether_type */ + ptr += pattrib->hdrlen + + pattrib->iv_len + +LLC_HEADER_LENGTH ; +memcpy (&be_tmp, ptr,2 ); + ether_type =ntohs (be_tmp); + +if (ether_type != eapol_type) { +rtw_free_recvframe (precv_frame, + &adapter->recvpriv.free_recv_queue); + prtnframe =NULL ; + } } }else {/* allowed */
Signature · 1 line
2.43.0
Re: [PATCH v3 3/5] staging: rtl8723bs: fix out-of-bounds read in portctrl()
Quoted 57 lines · Delene Tchio Romuald
In
portctrl(), the pointer is advanced by hdrlen +iv_len+LLC_HEADER_LENGTHand then 2 bytes are read viamemcpy()to extract theether_typefield. There is no check that the frame is large enough to contain these fields, so a short frame leads to an out-of-bounds read on kernel heap memory.This code is reachable during 802.1X authentication when the station is in the
ieee8021x_blockedstate.Add a frame length check before the pointer arithmetic and wrap the existing
ether_typeextraction in the else branch so that short frames are dropped safely.Found by reviewing memory operations in the driver. Not tested on hardware.
Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-nextdrivers/staging/rtl8723bs/core/rtw_recv.c | 28 +++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-)drivers/staging/rtl8723bs/core/rtw_recv.c +11
-10@@ -539,17 +539,25 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre prtnframe = precv_frame; -/* get ether_type */ - ptr = ptr + pfhdr->attrib.hdrlen + pfhdr->attrib.iv_len +LLC_HEADER_LENGTH ; -memcpy (&be_tmp, ptr,2 ); - ether_type =ntohs (be_tmp); - -if (ether_type == eapol_type) - prtnframe = precv_frame; -else { -/* free this frame */ -rtw_free_recvframe (precv_frame, &adapter->recvpriv.free_recv_queue); +/* Ensure frame has LLC header and ether_type */ +if (pfhdr->len < pattrib->hdrlen + + pattrib->iv_len +LLC_HEADER_LENGTH +2 ) { +rtw_free_recvframe (precv_frame, + &adapter->recvpriv.free_recv_queue); prtnframe =NULL ; + }else { +/* get ether_type */ + ptr += pattrib->hdrlen + + pattrib->iv_len + +LLC_HEADER_LENGTH ; +memcpy (&be_tmp, ptr,2 );
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre · line 563
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +7
-0+ ether_type =ntohs (be_tmp); + +if (ether_type != eapol_type) { +rtw_free_recvframe (precv_frame, + &adapter->recvpriv.free_recv_queue); + prtnframe =NULL ; + } } }else {/* allowed */
LGTM.
Best regards,
Luka Gejak
PATCH v3 4/5 staging: rtl8723bs: fix out-of-bounds reads in IE parsing functions
In reply to Delene Tchio RomualdThe IE parsing loops in rtw_get_wapi_ie(), rtw_get_sec_ie(), and rtw_get_wps_ie() check only that the element ID byte is within bounds (cnt < in_len), but then immediately access the length byte at in_ie[cnt+1] and data bytes at in_ie[cnt+2] and beyond without verifying that these offsets are within the buffer.
A malicious access point can send beacon or probe response frames with truncated Information Elements, triggering out-of-bounds reads on kernel heap memory. No authentication is required.
Add two bounds checks to each function:
- Ensure at least 2 bytes remain for the IE header (cnt + 1 < in_len)
- Validate the full IE fits in the buffer before accessing its data (cnt + 2 + ie_len <= in_len)
Found by reviewing memory operations in the driver. Not tested on hardware.
---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 did not apply due to code reformatting)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +12 -3
@@ -582,9 +582,12 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len) cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); -while (cnt < in_len) { +while (cnt +1 < in_len) { authmode = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp (&in_ie[cnt +6 ], wapi_oui1,4 ) || !memcmp (&in_ie[cnt +6 ], wapi_oui2,4 ))) {
@@ -615,9 +618,12 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); -while (cnt < in_len) { +while (cnt +1 < in_len) { authmode = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) {if (wpa_ie)
@@ -658,9 +664,12 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) cnt =0 ; -while (cnt < in_len) { +while (cnt +1 < in_len) { eid = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], wps_oui,4 ))) { wpsie_ptr = &in_ie[cnt];
Signature · 1 line
2.43.0
Re: [PATCH v3 4/5] staging: rtl8723bs: fix out-of-bounds reads in IE parsing functions
Quoted 65 lines · Delene Tchio Romuald
The IE parsing loops in
rtw_get_wapi_ie(),rtw_get_sec_ie(), andrtw_get_wps_ie()check only that the element ID byte is within bounds (cnt <in_len), but then immediately access the length byte at in_ie[cnt+1] and data bytes at in_ie[cnt+2] and beyond without verifying that these offsets are within the buffer.A malicious access point can send beacon or probe response frames with truncated Information Elements, triggering out-of-bounds reads on kernel heap memory. No authentication is required.
Add two bounds checks to each function:
- Ensure at least 2 bytes remain for the IE header (cnt + 1 <in_len)
- Validate the full IE fits in the buffer before accessing its data (cnt + 2 +ie_len<=in_len)Found by reviewing memory operations in the driver. Not tested on hardware.
Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
v2:
- Rebased on staging-next (v1 did not apply due to code reformatting)drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/staging/rtl8723bs/core/rtw_ieee80211.c +8
-2@@ -582,9 +582,12 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len) cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); -while (cnt < in_len) { +while (cnt +1 < in_len) { authmode = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if (authmode ==WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp (&in_ie[cnt +6 ], wapi_oui1,4 ) || !memcmp (&in_ie[cnt +6 ], wapi_oui2,4 ))) {@@ -615,9 +618,12 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_); -while (cnt < in_len) { +while (cnt +1 < in_len) { authmode = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) {if (wpa_ie)@@ -658,9 +664,12 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) cnt =0 ;
drivers/staging/rtl8723bs/core/rtw_ieee80211.c u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) · line 675
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +4
-1-while (cnt < in_len) { +while (cnt +1 < in_len) { eid = in_ie[cnt]; +if (cnt +2 + in_ie[cnt +1 ] > in_len) +break ; +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], wps_oui,4 ))) { wpsie_ptr = &in_ie[cnt];
LGTM.
Best regards,
Luka Gejak
PATCH v3 5/5 staging: rtl8723bs: fix negative length in WEP decryption
In reply to Delene Tchio RomualdIn rtw_wep_decrypt(), length is declared as signed int and computed as:
length = len - hdrlen - iv_len;
If the received frame is shorter than the combined header and IV lengths, length becomes negative. It is then passed to arc4_crypt() which takes a u32 parameter, causing the negative value to be implicitly cast to a very large unsigned value (e.g., -8 becomes 4294967288). This results in a massive out-of-bounds read and write on the heap via arc4_crypt(), and a similar overflow at the subsequent crc32_le() call using length - 4.
Add a minimum frame length check before the subtraction to ensure length is always positive.
Found by reviewing memory operations in the driver. Not tested on hardware.
---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pl
drivers/staging/rtl8723bs/core/rtw_security.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/staging/rtl8723bs/core/rtw_security.c +6 -0
@@ -113,6 +113,12 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)memcpy (&wepkey[0 ], iv,3 );/* memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0], keylength); */ memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[keyindex].skey[0 ], keylength); + +/* Ensure the frame is long enough for WEP decryption */ +if (((union recv_frame *)precvframe)->u.hdr.len <= + prxattrib->hdrlen + prxattrib->iv_len) +return ; + length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len; payload = pframe + prxattrib->iv_len + prxattrib->hdrlen;
Signature · 1 line
2.43.0
Re: [PATCH v3 5/5] staging: rtl8723bs: fix negative length in WEP decryption
Quoted 34 lines · Delene Tchio Romuald
In
rtw_wep_decrypt(), length is declared as signed int and computed as:length = len - hdrlen - iv_len;If the received frame is shorter than the combined header and IV lengths, length becomes negative. It is then passed to
arc4_crypt()which takes a u32 parameter, causing the negative value to be implicitly cast to a very large unsigned value (e.g., -8 becomes 4294967288). This results in a massive out-of-bounds read and write on the heap viaarc4_crypt(), and a similar overflow at the subsequentcrc32_le()call using length - 4.Add a minimum frame length check before the subtraction to ensure length is always positive.
Found by reviewing memory operations in the driver. Not tested on hardware.
Signed-off-by Delene Tchio Romuald <[email protected]>---
v3:
- Rebased on staging-next
- Sent as numbered series with proper Cc from get_maintainer.pldrivers/staging/rtl8723bs/core/rtw_security.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/staging/rtl8723bs/core/rtw_security.c +0
-0@@ -113,6 +113,12 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)memcpy (&wepkey[0 ], iv,3 );/* memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0], keylength); */
drivers/staging/rtl8723bs/core/rtw_security.c void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) · line 124
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_security.c +6
-0memcpy (&wepkey[3 ], &psecuritypriv->dot11DefKey[keyindex].skey[0 ], keylength); + +/* Ensure the frame is long enough for WEP decryption */ +if (((union recv_frame *)precvframe)->u.hdr.len <= + prxattrib->hdrlen + prxattrib->iv_len) +return ; + length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len; payload = pframe + prxattrib->iv_len + prxattrib->hdrlen;
LGTM.
Best regards,
Luka Gejak