diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-10-01 10:49:06 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-01 13:07:53 -0700 |
| commit | be2644aac3e1db02d09f45d56206bbdafca582a2 (patch) | |
| tree | 36976d22af2d893c45cfb0e06cf651fcb5cc8028 /net/ipv4/tcp_ipv4.c | |
| parent | net: core: dev: replace state xoff flag comparison by netif_xmit_stopped method (diff) | |
| download | linux-dev-be2644aac3e1db02d09f45d56206bbdafca582a2.tar.xz linux-dev-be2644aac3e1db02d09f45d56206bbdafca582a2.zip | |
tcp: add ipv6_addr_v4mapped_loopback() helper
tcp_twsk_unique() has a hard coded assumption about ipv4 loopback
being 127/8
Lets instead use the standard ipv4_is_loopback() method,
in a new ipv6_addr_v4mapped_loopback() helper.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 2ee45e3755e9..27dc3c1e9094 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -121,11 +121,9 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == AF_INET6) { if (ipv6_addr_loopback(&tw->tw_v6_daddr) || - (ipv6_addr_v4mapped(&tw->tw_v6_daddr) && - (tw->tw_v6_daddr.s6_addr[12] == 127)) || + ipv6_addr_v4mapped_loopback(&tw->tw_v6_daddr) || ipv6_addr_loopback(&tw->tw_v6_rcv_saddr) || - (ipv6_addr_v4mapped(&tw->tw_v6_rcv_saddr) && - (tw->tw_v6_rcv_saddr.s6_addr[12] == 127))) + ipv6_addr_v4mapped_loopback(&tw->tw_v6_rcv_saddr)) loopback = true; } else #endif |