* [PATCH] wifi: mt76: mt7996: check the RX WCID before using its station link
@ 2026-11-15 17:27 Zhao Li
2026-11-16 8:48 ` Lorenzo Bianconi
0 siblings, 1 reply; 2+ messages in thread
From: Zhao Li @ 2026-11-15 17:27 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi, Ryder Lee
Cc: Shayne Chen, Sean Wang, Matthias Brugger,
AngeloGioacchino Del Regno, Chad Monroe, Peter Chiu,
StanleyYP Wang, Dylan Eskew, Bo Jiao, linux-wireless,
linux-kernel, linux-arm-kernel, linux-mediatek
mt7996_rx_get_wcid() returns NULL when the reported WLAN index does not
map to a station entry on a valid band. Commit a3ea1c309bf3 ("wifi:
mt76: mt7996: Fix mt7996_reverse_frag0_hdr_trans for MLO") made
mt7996_reverse_frag0_hdr_trans() load msta_link->sta while declaring its
locals, ahead of the !msta check that used to reject a NULL WCID. A
header-translated first fragment without a station WCID now
dereferences a NULL pointer in the receive path.
Check the link before loading its station pointer.
Found by code review and not reproduced; compile-tested only.
AI assistance was used.
Fixes: a3ea1c309bf3 ("wifi: mt76: mt7996: Fix mt7996_reverse_frag0_hdr_trans for MLO")
Cc: stable@vger.kernel.org
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index f36da545045b..186216f21d28 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -191,12 +191,12 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
struct ethhdr *eth_hdr = (struct ethhdr *)(skb->data + hdr_gap);
struct mt7996_sta_link *msta_link = (void *)status->wcid;
- struct mt7996_sta *msta = msta_link->sta;
struct ieee80211_bss_conf *link_conf;
__le32 *rxd = (__le32 *)skb->data;
struct ieee80211_sta *sta;
struct ieee80211_vif *vif;
struct ieee80211_hdr hdr;
+ struct mt7996_sta *msta;
u16 frame_control;
if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=
@@ -206,6 +206,10 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
if (!(le32_to_cpu(rxd[1]) & MT_RXD1_NORMAL_GROUP_4))
return -EINVAL;
+ if (!msta_link)
+ return -EINVAL;
+
+ msta = msta_link->sta;
if (!msta || !msta->vif)
return -EINVAL;
base-commit: 5dbf2415ca9821a611d09308e3b29d2c37e7cd77
--
2.56.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] wifi: mt76: mt7996: check the RX WCID before using its station link
2026-11-15 17:27 [PATCH] wifi: mt76: mt7996: check the RX WCID before using its station link Zhao Li
@ 2026-11-16 8:48 ` Lorenzo Bianconi
0 siblings, 0 replies; 2+ messages in thread
From: Lorenzo Bianconi @ 2026-11-16 8:48 UTC (permalink / raw)
To: Zhao Li
Cc: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Chad Monroe,
Peter Chiu, StanleyYP Wang, Dylan Eskew, Bo Jiao, linux-wireless,
linux-kernel, linux-arm-kernel, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 2311 bytes --]
> mt7996_rx_get_wcid() returns NULL when the reported WLAN index does not
> map to a station entry on a valid band. Commit a3ea1c309bf3 ("wifi:
> mt76: mt7996: Fix mt7996_reverse_frag0_hdr_trans for MLO") made
> mt7996_reverse_frag0_hdr_trans() load msta_link->sta while declaring its
> locals, ahead of the !msta check that used to reject a NULL WCID. A
> header-translated first fragment without a station WCID now
> dereferences a NULL pointer in the receive path.
>
> Check the link before loading its station pointer.
>
> Found by code review and not reproduced; compile-tested only.
>
> AI assistance was used.
>
> Fixes: a3ea1c309bf3 ("wifi: mt76: mt7996: Fix mt7996_reverse_frag0_hdr_trans for MLO")
> Cc: stable@vger.kernel.org
> Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> index f36da545045b..186216f21d28 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> @@ -191,12 +191,12 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
> struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
> struct ethhdr *eth_hdr = (struct ethhdr *)(skb->data + hdr_gap);
> struct mt7996_sta_link *msta_link = (void *)status->wcid;
> - struct mt7996_sta *msta = msta_link->sta;
> struct ieee80211_bss_conf *link_conf;
> __le32 *rxd = (__le32 *)skb->data;
> struct ieee80211_sta *sta;
> struct ieee80211_vif *vif;
> struct ieee80211_hdr hdr;
> + struct mt7996_sta *msta;
> u16 frame_control;
>
> if (le32_get_bits(rxd[3], MT_RXD3_NORMAL_ADDR_TYPE) !=
> @@ -206,6 +206,10 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
> if (!(le32_to_cpu(rxd[1]) & MT_RXD1_NORMAL_GROUP_4))
> return -EINVAL;
>
> + if (!msta_link)
> + return -EINVAL;
> +
> + msta = msta_link->sta;
> if (!msta || !msta->vif)
> return -EINVAL;
>
>
> base-commit: 5dbf2415ca9821a611d09308e3b29d2c37e7cd77
> --
> 2.56.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-16 8:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-15 17:27 [PATCH] wifi: mt76: mt7996: check the RX WCID before using its station link Zhao Li
2026-11-16 8:48 ` Lorenzo Bianconi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox