Revert "tcp: bind() fix when many ports are bound"
This reverts two commits:fda48a0d7a
tcp: bind() fix when many ports are bound and a follow-on fix for it:6443bb1fc2
ipv6: Fix inet6_csk_bind_conflict() It causes problems with binding listening sockets when time-wait sockets from a previous instance still are alive. It's too late to keep fiddling with this so late in the -rc series, and we'll deal with it in net-next-2.6 instead. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
eb4fd8cd35
commit
8d238b25b1
|
@ -70,17 +70,13 @@ int inet_csk_bind_conflict(const struct sock *sk,
|
||||||
(!sk->sk_bound_dev_if ||
|
(!sk->sk_bound_dev_if ||
|
||||||
!sk2->sk_bound_dev_if ||
|
!sk2->sk_bound_dev_if ||
|
||||||
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
|
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
|
||||||
const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
|
|
||||||
|
|
||||||
if (!reuse || !sk2->sk_reuse ||
|
if (!reuse || !sk2->sk_reuse ||
|
||||||
sk2->sk_state == TCP_LISTEN) {
|
sk2->sk_state == TCP_LISTEN) {
|
||||||
|
const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);
|
||||||
if (!sk2_rcv_saddr || !sk_rcv_saddr ||
|
if (!sk2_rcv_saddr || !sk_rcv_saddr ||
|
||||||
sk2_rcv_saddr == sk_rcv_saddr)
|
sk2_rcv_saddr == sk_rcv_saddr)
|
||||||
break;
|
break;
|
||||||
} else if (reuse && sk2->sk_reuse &&
|
}
|
||||||
sk2_rcv_saddr &&
|
|
||||||
sk2_rcv_saddr == sk_rcv_saddr)
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return node != NULL;
|
return node != NULL;
|
||||||
|
@ -124,11 +120,9 @@ again:
|
||||||
smallest_size = tb->num_owners;
|
smallest_size = tb->num_owners;
|
||||||
smallest_rover = rover;
|
smallest_rover = rover;
|
||||||
if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {
|
if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {
|
||||||
if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) {
|
spin_unlock(&head->lock);
|
||||||
spin_unlock(&head->lock);
|
snum = smallest_rover;
|
||||||
snum = smallest_rover;
|
goto have_snum;
|
||||||
goto have_snum;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
goto next;
|
goto next;
|
||||||
|
|
|
@ -42,16 +42,11 @@ int inet6_csk_bind_conflict(const struct sock *sk,
|
||||||
if (sk != sk2 &&
|
if (sk != sk2 &&
|
||||||
(!sk->sk_bound_dev_if ||
|
(!sk->sk_bound_dev_if ||
|
||||||
!sk2->sk_bound_dev_if ||
|
!sk2->sk_bound_dev_if ||
|
||||||
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
|
sk->sk_bound_dev_if == sk2->sk_bound_dev_if) &&
|
||||||
if ((!sk->sk_reuse || !sk2->sk_reuse ||
|
(!sk->sk_reuse || !sk2->sk_reuse ||
|
||||||
sk2->sk_state == TCP_LISTEN) &&
|
sk2->sk_state == TCP_LISTEN) &&
|
||||||
ipv6_rcv_saddr_equal(sk, sk2))
|
ipv6_rcv_saddr_equal(sk, sk2))
|
||||||
break;
|
break;
|
||||||
else if (sk->sk_reuse && sk2->sk_reuse &&
|
|
||||||
!ipv6_addr_any(inet6_rcv_saddr(sk)) &&
|
|
||||||
ipv6_rcv_saddr_equal(sk, sk2))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return node != NULL;
|
return node != NULL;
|
||||||
|
|
Reference in New Issue