Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d238b25 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "tcp: bind() fix when many ports are bound" 



This reverts two commits:

fda48a0d
tcp: bind() fix when many ports are bound

and a follow-on fix for it:

6443bb1f
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: default avatarDavid S. Miller <davem@davemloft.net>
parent eb4fd8cd

net/ipv4/inet_connection_sock.c

+5 −11
Original line number Diff line number Diff line
@@ -70,17 +70,13 @@ int inet_csk_bind_conflict(const struct sock *sk, 
		    (!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 ||

			    sk2->sk_state == TCP_LISTEN) {

				const __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2);

				if (!sk2_rcv_saddr || !sk_rcv_saddr ||

				    sk2_rcv_saddr == sk_rcv_saddr)

					break;

			} else if (reuse && sk2->sk_reuse &&

				   sk2_rcv_saddr &&

				   sk2_rcv_saddr == sk_rcv_saddr)

				break;

			}

		}

	}

	return node != NULL;
@@ -124,13 +120,11 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) 
						smallest_size = tb->num_owners;

						smallest_rover = rover;

						if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {

							if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) {

							spin_unlock(&head->lock);

							snum = smallest_rover;

							goto have_snum;

						}

					}

					}

					goto next;

				}

			break;

net/ipv6/inet6_connection_sock.c

+5 −10
Original line number Diff line number Diff line
@@ -42,16 +42,11 @@ int inet6_csk_bind_conflict(const struct sock *sk, 
		if (sk != sk2 &&

		    (!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_bound_dev_if == sk2->sk_bound_dev_if) &&

		    (!sk->sk_reuse || !sk2->sk_reuse ||

		     sk2->sk_state == TCP_LISTEN) &&

		     ipv6_rcv_saddr_equal(sk, sk2))

			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;