Unverified Commit 3a72ab4d authored Jun 07, 2024 by openeuler-ci-bot Committed by Gitee Jun 07, 2024

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OWRVMZYYSYS27D7FV6RNOWTUKLUGC6KU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9UAZH 
 
Link:https://gitee.com/openeuler/kernel/pulls/8635

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents 1759a1ee 77452080

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;