Commit 77452080 authored by Shigeru Yoshida's avatar Shigeru Yoshida Committed by Zhengchao Shao
Browse files

ipv6: Fix potential uninit-value access in __ip6_make_skb() 

mainline inclusion
from mainline-v6.9-rc7
commit 4e13d3a9c25b7080f8a619f961e943fe08c2672c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9UAZH
CVE: CVE-2024-36903

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



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

As it was done in commit fc1092f51567 ("ipv4: Fix uninit-value access in
__ip_make_skb()") for IPv4, check FLOWI_FLAG_KNOWN_NH on fl6->flowi6_flags
instead of testing HDRINCL on the socket to avoid a race condition which
causes uninit-value access.

Fixes: ea30388b ("ipv6: Fix an uninit variable access bug in __ip6_make_skb()")
Signed-off-by: default avatarShigeru Yoshida <syoshida@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>

Conflicts:
	net/ipv6/ip6_output.c
[The conflict occurs because commit cafbe182("inet: move inet->hdrincl to
inet->inet_flags") is not merged]
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent 623051c7

net/ipv6/ip6_output.c

+2 −1
Original line number Diff line number Diff line
@@ -1933,7 +1933,8 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 
		struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));

		u8 icmp6_type;



		if (sk->sk_socket->type == SOCK_RAW && !inet_sk(sk)->hdrincl)

		if (sk->sk_socket->type == SOCK_RAW &&

		    !(fl6->flowi6_flags & FLOWI_FLAG_KNOWN_NH))

			icmp6_type = fl6->fl6_icmp_type;

		else

			icmp6_type = icmp6_hdr(skb)->icmp6_type;