mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] wifi: rtw89: read the beacon header from the frame data
@ 2026-11-18  5:46 Shirong Zhao
  2026-11-19  2:29 ` Ping-Ke Shih
  0 siblings, 1 reply; 2+ messages in thread
From: Shirong Zhao @ 2026-11-18  5:46 UTC (permalink / raw)
  To: Ping-Ke Shih; +Cc: linux-wireless, Johannes Berg, linux-kernel

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.

Found by code inspection; not observed at runtime.
Signed-off-by: Shirong Zhao <shxzhaosr@163.com>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 21b548c..0eab77f 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -5130,7 +5130,7 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
 		skb_put_data(skb_beacon, noa_data, noa_len);
 	}
 
-	hdr = (struct ieee80211_hdr *)skb_beacon;
+	hdr = (struct ieee80211_hdr *)skb_beacon->data;
 	tim_offset -= ieee80211_hdrlen(hdr->frame_control);
 
 	bcn_total_len = len + skb_beacon->len;
@@ -5209,7 +5209,7 @@ int rtw89_fw_h2c_update_beacon_be(struct rtw89_dev *rtwdev,
 		skb_put_data(skb_beacon, noa_data, noa_len);
 	}
 
-	hdr = (struct ieee80211_hdr *)skb_beacon;
+	hdr = (struct ieee80211_hdr *)skb_beacon->data;
 	tim_offset -= ieee80211_hdrlen(hdr->frame_control);
 
 	bcn_total_len = len + skb_beacon->len;


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-19  2:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18  5:46 [PATCH] wifi: rtw89: read the beacon header from the frame data Shirong Zhao
2026-11-19  2:29 ` Ping-Ke Shih

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®