| Message ID | 20240506141129.2434319-1-syoshida@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4e13d3a9c25b7080f8a619f961e943fe08c2672c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipv6: Fix potential uninit-value access in __ip6_make_skb() | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 6 May 2024 23:11:29 +0900 you wrote: > 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: ea30388baebc ("ipv6: Fix an uninit variable access bug in __ip6_make_skb()") > Signed-off-by: Shigeru Yoshida <syoshida@redhat.com> > > [...] Here is the summary with links: - [net] ipv6: Fix potential uninit-value access in __ip6_make_skb() https://git.kernel.org/netdev/net/c/4e13d3a9c25b You are awesome, thank you!
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index b9dd3a66e423..fa2937732665 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1933,7 +1933,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, u8 icmp6_type; if (sk->sk_socket->type == SOCK_RAW && - !inet_test_bit(HDRINCL, sk)) + !(fl6->flowi6_flags & FLOWI_FLAG_KNOWN_NH)) icmp6_type = fl6->fl6_icmp_type; else icmp6_type = icmp6_hdr(skb)->icmp6_type;
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: ea30388baebc ("ipv6: Fix an uninit variable access bug in __ip6_make_skb()") Signed-off-by: Shigeru Yoshida <syoshida@redhat.com> --- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)