The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Christian Lamparter <chunkeey@gmail.com>
To: Tristan Madani <tristmd@gmail.com>,
	Christian Lamparter <chunkeey@googlemail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
	linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tristan Madani <tristan@talencesecurity.com>
Subject: Re: [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path
Date: Sat, 4 Jul 2026 21:48:40 +0200	[thread overview]
Message-ID: <fe1630ad-07fa-48cc-8ca1-72dd7a0e088a@gmail.com> (raw)
In-Reply-To: <20260421134929.325662-4-tristmd@gmail.com>

On 4/21/26 3:49 PM, Tristan Madani wrote:
> From: Tristan Madani <tristan@talencesecurity.com>
> 
> 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.
> 
> Fixes: a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend")
> Signed-off-by: Tristan Madani <tristan@talencesecurity.com>
Acked-by: Christian Lamparter <chunkeey@gmail.com>


> ---
> 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(-)
> 
> diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
> index f6855efc05c0f..ccadc46385240 100644
> --- a/drivers/net/wireless/ath/carl9170/rx.c
> +++ b/drivers/net/wireless/ath/carl9170/rx.c
> @@ -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) {


  parent reply	other threads:[~2026-07-04 19:48 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-21 13:49 [PATCH v3 0/3] wifi: carl9170: firmware trust boundary hardening Tristan Madani
2026-04-21 13:49 ` [PATCH v3 1/3] wifi: carl9170: bound memcpy length in cmd callback to prevent OOB read Tristan Madani
2026-07-04 19:48   ` Christian Lamparter
2026-04-21 13:49 ` [PATCH v3 2/3] wifi: carl9170: fix OOB read from off-by-two in TX status handler Tristan Madani
2026-07-04 19:48   ` Christian Lamparter
2026-04-21 13:49 ` [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path Tristan Madani
2026-07-01 18:32   ` Jeff Johnson
2026-07-04 19:48   ` Christian Lamparter [this message]
2026-07-01 17:47 ` [PATCH v3 0/3] wifi: carl9170: firmware trust boundary hardening Jeff Johnson
2026-07-04 19:47   ` Christian Lamparter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fe1630ad-07fa-48cc-8ca1-72dd7a0e088a@gmail.com \
    --to=chunkeey@gmail.com \
    --cc=chunkeey@googlemail.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=tristan@talencesecurity.com \
    --cc=tristmd@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox