diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-26 00:09:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-26 00:09:42 +0200 |
| commit | 6443bb1fc2050ca2b6585a3fa77f7833b55329ed (patch) | |
| tree | 1a6634f8a857fb3ef050ef37fd467ac138efe5d8 | |
| parent | e100: Fix the TX workqueue race (diff) | |
| download | linux-6443bb1fc2050ca2b6585a3fa77f7833b55329ed.tar.xz linux-6443bb1fc2050ca2b6585a3fa77f7833b55329ed.zip | |
ipv6: Fix inet6_csk_bind_conflict()
Commit fda48a0d7a84 (tcp: bind() fix when many ports are bound)
introduced a bug on IPV6 part.
We should not call ipv6_addr_any(inet6_rcv_saddr(sk2)) but
ipv6_addr_any(inet6_rcv_saddr(sk)) because sk2 can be IPV4, while sk is
IPV6.
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Tested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index b4b7d40a9c95..3a4d92b5a83e 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk, ipv6_rcv_saddr_equal(sk, sk2)) break; else if (sk->sk_reuse && sk2->sk_reuse && - !ipv6_addr_any(inet6_rcv_saddr(sk2)) && + !ipv6_addr_any(inet6_rcv_saddr(sk)) && ipv6_rcv_saddr_equal(sk, sk2)) break; } |