wifi: carl9170: firmware trust boundary hardening
v3 cover wifi: carl9170: firmware trust boundary hardening
From: Tristan Madani <[email protected]>
This series adds missing bounds checks for firmware-controlled fields in the carl9170 USB driver.
Patch 1 bounds the cmd callback memcpy to prevent heap overflow from an oversized firmware response. Patch 2 fixes an off-by-two in the TX status handler. Patch 3 caps the failover copy to rx_failover_missing bytes, using min_t per Christian Lamparter.
Changes in v3:
- Regenerated from wireless-next with proper git format-patch.
Changes in v2:
- Use min_t() instead of separate if-check in patch 3, per Christian Lamparter.
Tristan Madani (3):
wifi: carl9170: bound memcpy length in cmd callback to prevent OOB
read
wifi: carl9170: fix OOB read from off-by-two in TX status handler
wifi: carl9170: fix buffer overflow in rx_stream failover path
drivers/net/wireless/ath/carl9170/rx.c | 7 +++++-- drivers/net/wireless/ath/carl9170/tx.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.3
PATCH v3 1/3 wifi: carl9170: bound memcpy length in cmd callback to prevent OOB read
From: Tristan Madani <[email protected]>
When the firmware sends a command response with a length mismatch, carl9170_cmd_callback() logs the mismatch and calls carl9170_restart() but then falls through to memcpy(ar->readbuf, buffer + 4, len - 4). Since len comes from the firmware and can exceed ar->readlen, this copies more data than the readbuf was allocated for.
Bound the memcpy to min(len - 4, ar->readlen) so that the response is still completed -- avoiding repeated restarts from queued garbage -- while preventing an overread past the response buffer.
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines).
Changes in v2:
- No code changes from v1.
drivers/net/wireless/ath/carl9170/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/rx.c +2 -1
@@ -150,7 +150,8 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)spin_lock (&ar->cmd_lock);if (ar->readbuf) {if (len >=4 ) -memcpy (ar->readbuf, buffer +4 , len -4 ); +memcpy (ar->readbuf, buffer +4 , +min_t (u32, len -4 , ar->readlen)); ar->readbuf =NULL ; }
Signature · 1 line
2.47.3
Re: [PATCH v3 1/3] wifi: carl9170: bound memcpy length in cmd callback to prevent OOB read
Quoted 8 lines · Tristan Madani
From: Tristan Madani <[email protected]>
When the firmware sends a command response with a length mismatch,
carl9170_cmd_callback()logs the mismatch and callscarl9170_restart()but then falls through tomemcpy(ar->readbuf, buffer + 4, len - 4). Since len comes from the firmware and can exceedar->readlen, this copies more data than the readbuf was allocated for.
Quoted 6 lines
Bound the memcpy to
min(len - 4, ar->readlen)so that the response is still completed -- avoiding repeated restarts from queued garbage -- while preventing an overread past the response buffer.Fixes a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend")Signed-off-by Tristan Madani <[email protected]>
Quoted 25 lines
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines).Changes in v2:
- No code changes from v1.drivers/net/wireless/ath/carl9170/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/rx.c +2
-1@@ -150,7 +150,8 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)spin_lock (&ar->cmd_lock);if (ar->readbuf) {if (len >=4 ) -memcpy (ar->readbuf, buffer +4 , len -4 ); +memcpy (ar->readbuf, buffer +4 , +min_t (u32, len -4 , ar->readlen)); ar->readbuf =NULL ; }
PATCH v3 2/3 wifi: carl9170: fix OOB read from off-by-two in TX status handler
In reply to Tristan MadaniFrom: Tristan Madani <[email protected]>
The bounds check in carl9170_tx_process_status() usesi > ((cmd->hdr.len / 2) + 1) which is off by two, allowing 2 extra iterations past valid _tx_status entries when the firmware- controlled hdr.ext exceeds hdr.len/2. Fix by using the correct comparison i >= (cmd->hdr.len / 2).
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines).
Changes in v2:
- No code changes from v1.
drivers/net/wireless/ath/carl9170/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/tx.c +1 -1
@@ -692,7 +692,7 @@ void carl9170_tx_process_status(struct ar9170 *ar,unsigned int i;for (i =0 ; i < cmd->hdr.ext; i++) { -if (WARN_ON (i > ((cmd->hdr.len /2 ) +1 ))) { +if (WARN_ON (i >= (cmd->hdr.len /2 ))) {print_hex_dump_bytes ("UU:" ,DUMP_PREFIX_NONE , (void *) cmd, cmd->hdr.len +4 );break ;
Signature · 1 line
2.47.3
Re: [PATCH v3 2/3] wifi: carl9170: fix OOB read from off-by-two in TX status handler
Quoted 10 lines · Tristan Madani
From: Tristan Madani <[email protected]>
The bounds check in
carl9170_tx_process_status()usesi > ((cmd->hdr.len / 2) + 1)which is off by two, allowing 2 extra iterations past valid_tx_statusentries when the firmware- controlled hdr.ext exceeds hdr.len/2. Fix by using the correct comparisoni >= (cmd->hdr.len / 2).Fixes a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend")Signed-off-by Tristan Madani <[email protected]>
Quoted 24 lines
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch to produce valid index hashes (v2 had post-processed index lines).Changes in v2:
- No code changes from v1.drivers/net/wireless/ath/carl9170/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/tx.c +1
-1@@ -692,7 +692,7 @@ void carl9170_tx_process_status(struct ar9170 *ar,unsigned int i;for (i =0 ; i < cmd->hdr.ext; i++) { -if (WARN_ON (i > ((cmd->hdr.len /2 ) +1 ))) { +if (WARN_ON (i >= (cmd->hdr.len /2 ))) {print_hex_dump_bytes ("UU:" ,DUMP_PREFIX_NONE , (void *) cmd, cmd->hdr.len +4 );break ;
PATCH v3 3/3 wifi: carl9170: fix buffer overflow in rx_stream failover path
In reply to Tristan MadaniFrom: Tristan Madani <[email protected]>
The failover continuation in carl9170_rx_stream() copies the full tlen from the second USB transfer instead of capping at rx_failover_missing bytes. When both transfers are near maximum size, the total exceeds the 65535-byte failover SKB, triggering skb_over_panic.
Limit the copy size to the missing byte count.
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch.
Changes in v2:
- Use min_t() instead of separate if-check, per Christian Lamparter.
drivers/net/wireless/ath/carl9170/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/rx.c +3 -1
@@ -918,7 +918,9 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) } } -skb_put_data (ar->rx_failover, tbuf, tlen); +skb_put_data (ar->rx_failover, tbuf, + min_t(unsigned int, tlen, + ar->rx_failover_missing)); ar->rx_failover_missing -= tlen;if (ar->rx_failover_missing <=0 ) {
Signature · 1 line
2.47.3
Re: [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path
Quoted 26 lines · Tristan Madani
From: Tristan Madani <[email protected]>
The failover continuation in
carl9170_rx_stream()copies the full tlen from the second USB transfer instead of capping atrx_failover_missingbytes. When both transfers are near maximum size, the total exceeds the 65535-byte failover SKB, triggeringskb_over_panic.Limit the copy size to the missing byte count.
Fixes a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend")Signed-off-by Tristan Madani <[email protected]>---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch.Changes in v2:
- Usemin_t()instead of separate if-check, per Christian Lamparter.drivers/net/wireless/ath/carl9170/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/rx.c +0
-0
drivers/net/wireless/ath/carl9170/rx.c static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) · line 922
Quoted 6 lines
drivers/net/wireless/ath/carl9170/rx.c +2
-1@@ -918,7 +918,9 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) } } -skb_put_data (ar->rx_failover, tbuf, tlen); + skb_put_data(ar->rx_failover, tbuf, + min_t(unsigned int, tlen,
checkpatch complains:
CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
no need to repost for this, I can fix when applying
Quoted 4 lines
drivers/net/wireless/ath/carl9170/rx.c +1
-0+ ar->rx_failover_missing)); ar->rx_failover_missing -= tlen;if (ar->rx_failover_missing <=0 ) {
Re: [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path
In reply to Tristan MadaniQuoted 11 lines · Tristan Madani
From: Tristan Madani <[email protected]>
The failover continuation in
carl9170_rx_stream()copies the full tlen from the second USB transfer instead of capping atrx_failover_missingbytes. When both transfers are near maximum size, the total exceeds the 65535-byte failover SKB, triggeringskb_over_panic.Limit the copy size to the missing byte count.
Fixes a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend")Signed-off-by Tristan Madani <[email protected]>
Quoted 25 lines
---
Changes in v3:
- Regenerated from wireless-next with proper git format-patch.Changes in v2:
- Usemin_t()instead of separate if-check, per Christian Lamparter.drivers/net/wireless/ath/carl9170/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/rx.c +3
-1@@ -918,7 +918,9 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) } } -skb_put_data (ar->rx_failover, tbuf, tlen); +skb_put_data (ar->rx_failover, tbuf, + min_t(unsigned int, tlen, + ar->rx_failover_missing)); ar->rx_failover_missing -= tlen;if (ar->rx_failover_missing <=0 ) {
Quoted 23 lines · Tristan Madani
From: Tristan Madani <[email protected]>
This series adds missing bounds checks for firmware-controlled fields in the carl9170 USB driver.
Patch 1 bounds the cmd callback memcpy to prevent heap overflow from an oversized firmware response. Patch 2 fixes an off-by-two in the TX status handler. Patch 3 caps the failover copy to
rx_failover_missingbytes, usingmin_tper Christian Lamparter.Changes in v3:
- Regenerated from wireless-next with proper git format-patch.Changes in v2:
- Usemin_t()instead of separate if-check in patch 3, per Christian Lamparter.Tristan Madani (3):
wifi: carl9170: bound memcpy length in cmd callback to prevent OOB
read
wifi: carl9170: fix OOB read from off-by-two in TX status handler
wifi: carl9170: fix buffer overflow inrx_streamfailover path
Quoted 4 lines
drivers/net/wireless/ath/carl9170/rx.c | 7 +++++-- drivers/net/wireless/ath/carl9170/tx.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
Christian, will you be able to review this series? I'll take it once I get reviewed-by or acked-by tags. And then we can ignore the dups from others.
/jeff
Quoted 24 lines · Jeff Johnson
Quoted 23 lines · Tristan Madani
From: Tristan Madani <[email protected]>
This series adds missing bounds checks for firmware-controlled fields in the carl9170 USB driver.
Patch 1 bounds the cmd callback memcpy to prevent heap overflow from an oversized firmware response. Patch 2 fixes an off-by-two in the TX status handler. Patch 3 caps the failover copy to
rx_failover_missingbytes, usingmin_tper Christian Lamparter.Changes in v3:
- Regenerated from wireless-next with proper git format-patch.Changes in v2:
- Usemin_t()instead of separate if-check in patch 3, per Christian Lamparter.Tristan Madani (3):
wifi: carl9170: bound memcpy length in cmd callback to prevent OOB
read
wifi: carl9170: fix OOB read from off-by-two in TX status handler
wifi: carl9170: fix buffer overflow inrx_streamfailover path
Quoted 8 lines
Quoted 4 lines
drivers/net/wireless/ath/carl9170/rx.c | 7 +++++-- drivers/net/wireless/ath/carl9170/tx.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)Christian, will you be able to review this series? I'll take it once I get reviewed-by or acked-by tags. And then we can ignore the dups from others.
From what I can tell, the "others" made the effort to also check skzkaller. i.e: https://www.spinics.net/lists/stable/msg965098.html
Wouldn't it be possible to merge this information with the patch? I guess not. Oh well.
As for the series I do have a headache with patch 2, I wonder why none of the other AI-fueled mails proposed the same.
Jeff Johnson
AppliedQuoted 11 lines · Tristan Madani
From: Tristan Madani <[email protected]>
This series adds missing bounds checks for firmware-controlled fields in the carl9170 USB driver.
Patch 1 bounds the cmd callback memcpy to prevent heap overflow from an oversized firmware response. Patch 2 fixes an off-by-two in the TX status handler. Patch 3 caps the failover copy to
rx_failover_missingbytes, usingmin_tper Christian Lamparter.[...]
Applied, thanks!
[1/3] wifi: carl9170: bound memcpy length in cmd callback to prevent OOB read
commit: 4cde55b2feff9504d1f993ab80e84e7ccb62791c
[2/3] wifi: carl9170: fix OOB read from off-by-two in TX status handler
commit: a3f42f1049ad80c65560d2b078ad426c3134f78d
[3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path
commit: a1a21995c2e1cc2ca6b2226cfe4f5f018370182aBest regards,
Signature · 1 line
Jeff Johnson <[email protected]>