From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Felix Fietkau <nbd@nbd.name>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH mt76-next 12/19] wifi: mt76: check the PN of a BA session frame at its release
Date: Wed, 18 Nov 2026 09:55:49 +0100 [thread overview]
Message-ID: <av1oFdgZJneuAgcg@lore-qca> (raw)
In-Reply-To: <20261117180134.2940930-12-nbd@nbd.name>
[-- Attachment #1: Type: text/plain, Size: 4149 bytes --]
On Nov 17, Felix Fietkau wrote:
> mt76_rx_complete() checks the PN after a frame left the reorder buffer,
> outside tid->lock. The links of an MLD peer share one PN state, so a
> frame released on one RX ring can be checked before an earlier frame of
> the same TID on another ring, which then reads as a replay. The reorder
> work has the same gap on a single link.
>
> Check the PN of a BA session frame where it leaves the reorder buffer,
> under tid->lock. mt76_rx_complete() still checks all other frames.
>
> Fixes: 30ce7f4456ae ("mt76: validate rx CCMP PN")
> Fixes: 62694ed0b76f ("wifi: mt76: check the RX PN of an MLD peer once per peer")
> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/agg-rx.c | 11 +++++++++++
> drivers/net/wireless/mediatek/mt76/mac80211.c | 6 ++++--
> drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++-
> 3 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> index bf1babac3895..49721b4faab1 100644
> --- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
> +++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
> @@ -12,6 +12,15 @@ static unsigned long mt76_aggr_tid_to_timeo(u8 tidno)
> return HZ / (tidno >= 4 ? 25 : 10);
> }
>
> +static void
> +mt76_rx_aggr_pn_check(struct sk_buff *skb)
> +{
> + struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
> +
> + mt76_check_ccmp_pn(skb);
> + status->skip_pn_check = true;
> +}
> +
> static void
> mt76_aggr_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames, int idx)
> {
> @@ -25,6 +34,7 @@ mt76_aggr_release(struct mt76_rx_tid *tid, struct sk_buff_head *frames, int idx)
>
> tid->reorder_buf[idx] = NULL;
> tid->nframes--;
> + mt76_rx_aggr_pn_check(skb);
> __skb_queue_tail(frames, skb);
> }
>
> @@ -204,6 +214,7 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
> }
>
> if (seqno == head) {
> + mt76_rx_aggr_pn_check(skb);
> tid->head = ieee80211_sn_inc(head);
> if (tid->nframes)
> mt76_rx_aggr_release_head(tid, frames);
> diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
> index d72ade2d46cb..b1789be134d6 100644
> --- a/drivers/net/wireless/mediatek/mt76/mac80211.c
> +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
> @@ -1387,8 +1387,7 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,
> *hw = mt76_phy_hw(dev, mstat.phy_idx);
> }
>
> -static void
> -mt76_check_ccmp_pn(struct sk_buff *skb)
> +void mt76_check_ccmp_pn(struct sk_buff *skb)
> {
> struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
> struct mt76_wcid *wcid = status->wcid;
> @@ -1403,6 +1402,9 @@ mt76_check_ccmp_pn(struct sk_buff *skb)
> if (status->flag & RX_FLAG_ONLY_MONITOR)
> return;
>
> + if (status->skip_pn_check)
> + return;
> +
> if (!wcid || !wcid->rx_check_pn)
> return;
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 8f8388d44aa9..0b16567920fa 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -774,7 +774,7 @@ struct mt76_rx_status {
> } eht;
> };
>
> - u8 amsdu:1, first_amsdu:1, last_amsdu:1;
> + u8 amsdu:1, first_amsdu:1, last_amsdu:1, skip_pn_check:1;
> u8 rate_idx;
> u8 nss:5, band:3;
> u8 chains;
> @@ -1842,6 +1842,7 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,
> void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,
> struct napi_struct *napi);
> void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames);
> +void mt76_check_ccmp_pn(struct sk_buff *skb);
> void mt76_testmode_tx_pending(struct mt76_phy *phy);
> void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q,
> struct mt76_queue_entry *e);
> --
> 2.47.3
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-11-18 8:55 UTC|newest]
Thread overview: 31+ 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-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 [this message]
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=av1oFdgZJneuAgcg@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