Commit 8693db65 authored by Felix Fietkau's avatar Felix Fietkau Committed by Wang Hai
Browse files

wifi: mt76: replace skb_put with skb_put_zero 

mainline inclusion
from mainline-v6.10-rc1
commit 7f819a2f4fbc510e088b49c79addcf1734503578
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGPSS
CVE: CVE-2024-42225

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7f819a2f4fbc510e088b49c79addcf1734503578



--------------------------------

Avoid potentially reusing uninitialized data

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>

Conflicts:
    drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
[commit d0e274af ("mt76: mt76_connac: create mcu library") is not
merged resulting in a conflict]
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
parent ddbf1dbd

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len, 
		.len = cpu_to_le16(sub_len),

	};



	ptlv = skb_put(skb, sub_len);

	ptlv = skb_put_zero(skb, sub_len);

	memcpy(ptlv, &tlv, sizeof(tlv));



	le16_add_cpu(sub_ntlv, 1);