RE: [PATCH] wifi: rtw89: read the beacon header from the frame data

From: Ping-Ke Shih

Date: Wed Nov 18 2026 - 21:30:26 EST


Shirong Zhao <shxzhaosr@xxxxxxx> wrote:
> rtw89_fw_h2c_update_beacon() and rtw89_fw_h2c_update_beacon_be()
> cast the sk_buff pointer itself to struct ieee80211_hdr to compute the
> TIM offset:
>
> hdr = (struct ieee80211_hdr *)skb_beacon;
>
> The 802.11 header lives in the frame data returned by
> ieee80211_beacon_get_tim(), not at the start of struct sk_buff, so the
> cast reads sk_buff metadata instead of frame_control.
>
> For a freshly allocated skb skb->next is NULL, the value read is 0 and
> ieee80211_hdrlen() happens to return the same 24 bytes as a real beacon
> header, which masks the bug. As soon as the skb is on a list the
> computed header length is garbage and the Group IE offset passed to the
> firmware is wrong.
>
> Point hdr at skb_beacon->data instead.

This is key point, so I'd rephrase subject and commit message as:

subject: wifi: rtw89: read the beacon header from the skb data

message:
Point hdr at skb_beacon->data instead of skb_beacon pointer itself, to
get correct header length for TIM offset for firmware.

Fortunately, original (wrong) header fc is 0x0000, so header length is
recognized as 24 bytes, which is almost the same as AP mode application.

>
> Found by code inspection; not observed at runtime.

I tested with real hardware.

Tested-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>

Fixes: 69466b979a72 ("wifi: rtw89: use struct to fill H2C command to download beacon frame")
Fixes: a880b9283009 ("wifi: rtw89: add H2C command to download beacon frame for WiFi 7 chips")

> Signed-off-by: Shirong Zhao <shxzhaosr@xxxxxxx>

Acked-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>