Commit 16f6c251 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

tcp: Remove unnecessary conditions in inet_csk_bind_conflict(). 



When we get an ephemeral port, the relax is false, so the SO_REUSEADDR
conditions may be evaluated twice. We do not need to check the conditions
again.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.co.jp>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af91fd7e

net/ipv4/inet_connection_sock.c

+8 −10
Original line number Diff line number Diff line
@@ -146,17 +146,15 @@ static 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)) {

			if ((!reuse || !sk2->sk_reuse ||

			    sk2->sk_state == TCP_LISTEN) &&

			    (!reuseport || !sk2->sk_reuseport ||

			if (reuse && sk2->sk_reuse &&

			    sk2->sk_state != TCP_LISTEN) {

				if (!relax &&

				    inet_rcv_saddr_equal(sk, sk2, true))

					break;

			} else if (!reuseport || !sk2->sk_reuseport ||

				   rcu_access_pointer(sk->sk_reuseport_cb) ||

				   (sk2->sk_state != TCP_TIME_WAIT &&

			     !uid_eq(uid, sock_i_uid(sk2))))) {

				if (inet_rcv_saddr_equal(sk, sk2, true))

					break;

			}

			if (!relax && reuse && sk2->sk_reuse &&

			    sk2->sk_state != TCP_LISTEN) {

				    !uid_eq(uid, sock_i_uid(sk2)))) {

				if (inet_rcv_saddr_equal(sk, sk2, true))

					break;

			}