mt76: avoid uninitialized skb data
Subsystems (2)
PATCH 1/1 mt76: avoid uninitialized skb data
From: Arnd Bergmann <[email protected]>
Two functions in the mt7996 driver cause a clang-21 build warning because the pass uninitialized data into skb_put_data:
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:1894:21: error: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
1894 | skb_put_data(skb, &hdr, sizeof(hdr));
| ^~~drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:3386:21: error: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
3386 | skb_put_data(skb, &hdr, sizeof(hdr));
| ^~~
Remove the otherwise unused variables and instead use skb_put_zero() instead to fill the header with zeroes.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +4 -8
@@ -1880,18 +1880,17 @@ int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev, void *data, u16 version) {struct ra_fixed_rate *req; -struct uni_header hdr;struct sk_buff *skb;struct tlv *tlv;int len; - len =sizeof (hdr) +sizeof (*req); + len =sizeof (struct uni_header ) +sizeof (*req); skb =mt76_mcu_msg_alloc (&dev->mt76,NULL , len);if (!skb)return -ENOMEM ; -skb_put_data (skb, &hdr,sizeof (hdr)); +skb_put_zero (skb,sizeof (struct uni_header )); tlv =mt7996_mcu_add_uni_tlv (skb,UNI_RA_FIXED_RATE ,sizeof (*req)); req = (struct ra_fixed_rate *)tlv;
@@ -3370,20 +3369,17 @@ void mt7996_mcu_exit(struct mt7996_dev *dev)int mt7996_mcu_set_hdr_trans (struct mt7996_dev *dev,bool hdr_trans) { -struct { -u8 __rsv[4 ]; - } __packed hdr;struct hdr_trans_blacklist *req_blacklist;struct hdr_trans_en *req_en;struct sk_buff *skb;struct tlv *tlv; -int len =MT7996_HDR_TRANS_MAX_SIZE +sizeof (hdr); +int len =MT7996_HDR_TRANS_MAX_SIZE +4 ; skb =mt76_mcu_msg_alloc (&dev->mt76,NULL , len);if (!skb)return -ENOMEM ; -skb_put_data (skb, &hdr,sizeof (hdr)); +skb_put_zero (skb,4 ); tlv =mt7996_mcu_add_uni_tlv (skb,UNI_HDR_TRANS_EN ,sizeof (*req_en)); req_en = (struct hdr_trans_en *)tlv;
Signature · 1 line
2.39.5