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

Commit aa078842 authored by Josef Bacik's avatar Josef Bacik Committed by David S. Miller
Browse files

inet: drop ->bind_conflict 



The only difference between inet6_csk_bind_conflict and inet_csk_bind_conflict
is how they check the rcv_saddr, so delete this call back and simply
change inet_csk_bind_conflict to call inet_rcv_saddr_equal.

Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe38d2a1

include/net/inet6_connection_sock.h

+0 −5
Original line number Diff line number Diff line
@@ -15,16 +15,11 @@ 


#include <linux/types.h>



struct inet_bind_bucket;

struct request_sock;

struct sk_buff;

struct sock;

struct sockaddr;



int inet6_csk_bind_conflict(const struct sock *sk,

			    const struct inet_bind_bucket *tb, bool relax,

			    bool soreuseport_ok);



struct dst_entry *inet6_csk_route_req(const struct sock *sk, struct flowi6 *fl6,

				      const struct request_sock *req, u8 proto);

include/net/inet_connection_sock.h

+0 −6
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ struct inet_connection_sock_af_ops { 
				char __user *optval, int __user *optlen);

#endif

	void	    (*addr2sockaddr)(struct sock *sk, struct sockaddr *);

	int	    (*bind_conflict)(const struct sock *sk,

				     const struct inet_bind_bucket *tb,

				     bool relax, bool soreuseport_ok);

	void	    (*mtu_reduced)(struct sock *sk);

};
@@ -263,9 +260,6 @@ inet_csk_rto_backoff(const struct inet_connection_sock *icsk, 


struct sock *inet_csk_accept(struct sock *sk, int flags, int *err);



int inet_csk_bind_conflict(const struct sock *sk,

			   const struct inet_bind_bucket *tb, bool relax,

			   bool soreuseport_ok);

int inet_csk_get_port(struct sock *sk, unsigned short snum);



struct dst_entry *inet_csk_route_req(const struct sock *sk, struct flowi4 *fl4,

net/dccp/ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -904,7 +904,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { 
	.getsockopt	   = ip_getsockopt,

	.addr2sockaddr	   = inet_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in),

	.bind_conflict	   = inet_csk_bind_conflict,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_ip_setsockopt,

	.compat_getsockopt = compat_ip_getsockopt,

net/dccp/ipv6.c

+0 −2
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops = { 
	.getsockopt	   = ipv6_getsockopt,

	.addr2sockaddr	   = inet6_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in6),

	.bind_conflict	   = inet6_csk_bind_conflict,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_ipv6_setsockopt,

	.compat_getsockopt = compat_ipv6_getsockopt,
@@ -958,7 +957,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = { 
	.getsockopt	   = ipv6_getsockopt,

	.addr2sockaddr	   = inet6_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in6),

	.bind_conflict	   = inet6_csk_bind_conflict,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_ipv6_setsockopt,

	.compat_getsockopt = compat_ipv6_getsockopt,

net/ipv4/inet_connection_sock.c

+7 −15
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ void inet_get_local_port_range(struct net *net, int *low, int *high) 
}

EXPORT_SYMBOL(inet_get_local_port_range);



int inet_csk_bind_conflict(const struct sock *sk,

			   const struct inet_bind_bucket *tb, bool relax,

			   bool reuseport_ok)

static int inet_csk_bind_conflict(const struct sock *sk,

				  const struct inet_bind_bucket *tb,

				  bool relax, bool reuseport_ok)

{

	struct sock *sk2;

	bool reuse = sk->sk_reuse;
@@ -134,7 +134,6 @@ int inet_csk_bind_conflict(const struct sock *sk, 


	sk_for_each_bound(sk2, &tb->owners) {

		if (sk != sk2 &&

		    !inet_v6_ipv6only(sk2) &&

		    (!sk->sk_bound_dev_if ||

		     !sk2->sk_bound_dev_if ||

		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
@@ -144,23 +143,18 @@ int inet_csk_bind_conflict(const struct sock *sk, 
			     rcu_access_pointer(sk->sk_reuseport_cb) ||

			     (sk2->sk_state != TCP_TIME_WAIT &&

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



				if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||

				    sk2->sk_rcv_saddr == sk->sk_rcv_saddr)

				if (inet_rcv_saddr_equal(sk, sk2, true))

					break;

			}

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

			    sk2->sk_state != TCP_LISTEN) {



				if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr ||

				    sk2->sk_rcv_saddr == sk->sk_rcv_saddr)

				if (inet_rcv_saddr_equal(sk, sk2, true))

					break;

			}

		}

	}

	return sk2 != NULL;

}

EXPORT_SYMBOL_GPL(inet_csk_bind_conflict);



/* Obtain a reference to a local port for the given sock,

 * if snum is zero it means select any available local port.
@@ -239,8 +233,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) 
					smallest_size = tb->num_owners;

					smallest_port = port;

				}

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

									      reuseport_ok))

				if (!inet_csk_bind_conflict(sk, tb, false, reuseport_ok))

					goto tb_found;

				goto next_port;

			}
@@ -281,8 +274,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) 
		      sk->sk_reuseport && uid_eq(tb->fastuid, uid))) &&

		    smallest_size == -1)

			goto success;

		if (inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, true,

							     reuseport_ok)) {

		if (inet_csk_bind_conflict(sk, tb, true, reuseport_ok)) {

			if ((reuse ||

			     (tb->fastreuseport > 0 &&

			      sk->sk_reuseport &&