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

[IPV4/IPV6]: Always wait for IPSEC SA resolution in socket contexts. 



Do this even for non-blocking sockets.  This avoids the silly -EAGAIN
that applications can see now, even for non-blocking sockets in some
cases (f.e. connect()).

With help from Venkat Tekkirala.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba7808ea

include/net/route.h

+3 −2
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ static inline char rt_tos2priority(u8 tos) 


static inline int ip_route_connect(struct rtable **rp, __be32 dst,

				   __be32 src, u32 tos, int oif, u8 protocol,

				   __be16 sport, __be16 dport, struct sock *sk)

				   __be16 sport, __be16 dport, struct sock *sk,

				   int flags)

{

	struct flowi fl = { .oif = oif,

			    .nl_u = { .ip4_u = { .daddr = dst,
@@ -168,7 +169,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, 
		*rp = NULL;

	}

	security_sk_classify_flow(sk, &fl);

	return ip_route_output_flow(rp, &fl, sk, 0);

	return ip_route_output_flow(rp, &fl, sk, flags);

}



static inline int ip_route_newports(struct rtable **rp, u8 protocol,

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	tmp = ip_route_connect(&rt, nexthop, inet->saddr,

			       RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,

			       IPPROTO_DCCP,

			       inet->sport, usin->sin_port, sk);

			       inet->sport, usin->sin_port, sk, 1);

	if (tmp < 0)

		return tmp;

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	if (final_p)

		ipv6_addr_copy(&fl.fl6_dst, final_p);



	err = xfrm_lookup(&dst, &fl, sk, 0);

	err = xfrm_lookup(&dst, &fl, sk, 1);

	if (err < 0)

		goto failure;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
			       RT_CONN_FLAGS(sk),

			       sk->sk_bound_dev_if,

			       sk->sk_protocol,

			       inet->sport, inet->dport, sk);

			       inet->sport, inet->dport, sk, 0);

	if (err)

		return err;

net/ipv4/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	err = ip_route_connect(&rt, usin->sin_addr.s_addr, saddr,

			       RT_CONN_FLAGS(sk), oif,

			       sk->sk_protocol,

			       inet->sport, usin->sin_port, sk);

			       inet->sport, usin->sin_port, sk, 1);

	if (err)

		return err;

	if ((rt->rt_flags & RTCF_BROADCAST) && !sock_flag(sk, SOCK_BROADCAST)) {