wifi: mt76: connac: fix possible unaligned access in mt76_connac_mcu_add_nested_tlv
authorLorenzo Bianconi <lorenzo@kernel.org>
Mon, 25 Jul 2022 14:12:06 +0000 (16:12 +0200)
committerFelix Fietkau <nbd@nbd.name>
Thu, 15 Sep 2022 10:54:00 +0000 (12:54 +0200)
Fix possible unaligned pointer in mt76_connac_mcu_add_nested_tlv
routine.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 25702d9c55dc5 ("mt76: connac: rely on le16_add_cpu in mt76_connac_mcu_add_nested_tlv")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

index a54af6b..71c2b1d 100644 (file)
@@ -260,8 +260,10 @@ mt76_connac_mcu_add_nested_tlv(struct sk_buff *skb, int tag, int len,
        ntlv = le16_to_cpu(ntlv_hdr->tlv_num);
        ntlv_hdr->tlv_num = cpu_to_le16(ntlv + 1);
 
-       if (sta_hdr)
-               le16_add_cpu(&sta_hdr->len, len);
+       if (sta_hdr) {
+               len += le16_to_cpu(sta_hdr->len);
+               sta_hdr->len = cpu_to_le16(len);
+       }
 
        return ptlv;
 }