diff options
| author | Shigeru Yoshida <syoshida@redhat.com> | 2024-05-06 16:11:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-05-08 13:21:00 +0200 |
| commit | 4e13d3a9c25b7080f8a619f961e943fe08c2672c (patch) | |
| tree | b2eb44f6fe3b652bbf2fea5cc6adc2f1d1c7c210 | |
| parent | net: phy: marvell-88q2xxx: add support for Rev B1 and B2 (diff) | |
| download | linux-4e13d3a9c25b7080f8a619f961e943fe08c2672c.tar.xz linux-4e13d3a9c25b7080f8a619f961e943fe08c2672c.zip | |
ipv6: Fix potential uninit-value access in __ip6_make_skb()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |