Linux wireless drivers development
 help / color / mirror / Atom feed
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Felix Fietkau <nbd@nbd.name>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH mt76-next 09/19] wifi: mt76: find the first A-MSDU subframe behind the radiotap data
Date: Wed, 18 Nov 2026 10:42:02 +0100	[thread overview]
Message-ID: <av1y6mgMpXQcME8E@lore-qca> (raw)
In-Reply-To: <81acd946-dc4c-4fa4-81a7-4df0b7cb06f2@nbd.name>

[-- Attachment #1: Type: text/plain, Size: 2419 bytes --]

On Nov 18, Felix Fietkau wrote:
> On 18.11.26 09:43, Lorenzo Bianconi wrote:
> > > mt76_rx_release_amsdu() reads the first subframe relative to
> > > skb->data, which points to the radiotap data where the driver pushed HE
> > > fields or EHT TLVs. It then misses an RFC1042 header in place of the
> > > destination address, so an A-MSDU of an HE or EHT PPDU in 802.11 format
> > > passes the mitigation of CVE-2020-24588.
> > > 
> > > Locate the subframe behind the header that mt76_skb_get_hdr() returns.
> > > 
> > > Fixes: 2c2bdd2372af ("mt76: validate rx A-MSDU subframes")
> > > Signed-off-by: Felix Fietkau <nbd@nbd.name>
> > > ---
> > >  drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +++++++----
> > >  1 file changed, 7 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
> > > index bd822193e769..271fbd4711f7 100644
> > > --- a/drivers/net/wireless/mediatek/mt76/mac80211.c
> > > +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
> > > @@ -965,18 +965,21 @@ static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)
> > >  	 * address.
> > >  	 */
> > >  	if (skb_shinfo(skb)->frag_list) {
> > > -		int offset = 0;
> > > +		u8 *subframe = skb->data;
> > >  		if (!(status->flag & RX_FLAG_8023)) {
> > > -			offset = ieee80211_get_hdrlen_from_skb(skb);
> > > +			struct ieee80211_hdr *hdr = mt76_skb_get_hdr(skb);
> > > +
> > > +			subframe = (u8 *)hdr +
> > > +				   ieee80211_hdrlen(hdr->frame_control);
> > >  			if ((status->flag &
> > >  			     (RX_FLAG_DECRYPTED | RX_FLAG_IV_STRIPPED)) ==
> > >  			    RX_FLAG_DECRYPTED)
> > > -				offset += 8;
> > > +				subframe += 8;
> > >  		}
> > > -		if (ether_addr_equal(skb->data + offset, rfc1042_header)) {
> > > +		if (ether_addr_equal(subframe, rfc1042_header)) {
> > 
> > maybe I am too paranoic, but should we check this is part of the skb head
> > running pskb_may_pull()? Otherwise I am fine with the patch.
> This is only called for hw-deaggregated A-MSDU subframes, and each subframe
> has its own buffer. Even if the hardware were to misbehave and pass a
> truncated subframe here, the pointer would still be much closer to the start
> of the buffer than the end, and never overflow.

ack, in this case:

Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>

> 
> - Felix

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

  reply	other threads:[~2026-11-18  9:42 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 18:01 [PATCH mt76-next 01/19] wifi: mt76: don't pin undrainable PS stations in the tx scheduler Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 02/19] wifi: mt76: mt7996: return a negative error for a firmware status Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 03/19] wifi: mt76: mt7996: use the default timeout for STA_REC and BSS_INFO Felix Fietkau
2026-11-18  8:22   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 04/19] wifi: mt76: mt7915: " Felix Fietkau
2026-11-18  8:23   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 05/19] wifi: mt76: delete only the RX NAPIs that were added Felix Fietkau
2026-11-18  8:32   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 06/19] wifi: mt76: mt7996: report radar on the channel context of its band Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 07/19] wifi: mt76: mt7996: stop WED before the DMA reset of a full reset Felix Fietkau
2026-11-18  8:38   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 08/19] wifi: mt76: skip the radiotap TLVs in mt76_skb_get_hdr() Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 09/19] wifi: mt76: find the first A-MSDU subframe behind the radiotap data Felix Fietkau
2026-11-18  8:43   ` Lorenzo Bianconi
2026-11-18  9:34     ` Felix Fietkau
2026-11-18  9:42       ` Lorenzo Bianconi [this message]
2026-11-17 18:01 ` [PATCH mt76-next 10/19] wifi: mt76: mark all but the last subframe of an A-MSDU chain Felix Fietkau
2026-11-18  8:47   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 11/19] wifi: mt76: mt7996: set qos_ctl of a frame that hardware reordered Felix Fietkau
2026-11-18  8:50   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 12/19] wifi: mt76: check the PN of a BA session frame at its release Felix Fietkau
2026-11-18  8:55   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 13/19] wifi: mt76: check the RX PN of CCMP-256, GCMP and GCMP-256 keys Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 14/19] wifi: mt76: connac: return a negative error for a firmware status Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 15/19] wifi: mt76: guard the tx_list of every phy with one lock Felix Fietkau
2026-11-18  8:52   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 16/19] wifi: mt76: keep an unpublished wcid off the TX and poll lists Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 17/19] wifi: mt76: mt7925: do not take iflist_mtx under the mutex Felix Fietkau
2026-11-17 18:01 ` [PATCH mt76-next 18/19] wifi: mt76: mt7925: take each polled link under sta_poll_lock Felix Fietkau
2026-11-18  8:58   ` Lorenzo Bianconi
2026-11-17 18:01 ` [PATCH mt76-next 19/19] wifi: mt76: mt7615: take each polled station " Felix Fietkau
2026-11-18  8:57   ` Lorenzo Bianconi
2026-11-18  8:20 ` [PATCH mt76-next 01/19] wifi: mt76: don't pin undrainable PS stations in the tx scheduler Lorenzo Bianconi

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=av1y6mgMpXQcME8E@lore-qca \
    --to=lorenzo@kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=nbd@nbd.name \
    /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