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

Commit 6e869138 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Use cork flow in inet_sk_{reselect_saddr,rebuild_header}() 



These two functions must be invoked only when the socket is locked
(because socket identity modifications are made non-atomically).

Therefore we can use the cork flow for output route lookups.

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

net/ipv4/af_inet.c

+7 −5
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
	struct inet_sock *inet = inet_sk(sk);

	__be32 old_saddr = inet->inet_saddr;

	__be32 daddr = inet->inet_daddr;

	struct flowi4 fl4;

	struct flowi4 *fl4;

	struct rtable *rt;

	__be32 new_saddr;

	struct ip_options_rcu *inet_opt;
@@ -1114,7 +1114,8 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
		daddr = inet_opt->opt.faddr;



	/* Query new route. */

	rt = ip_route_connect(&fl4, daddr, 0, RT_CONN_FLAGS(sk),

	fl4 = &inet->cork.fl.u.ip4;

	rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),

			      sk->sk_bound_dev_if, sk->sk_protocol,

			      inet->inet_sport, inet->inet_dport, sk, false);

	if (IS_ERR(rt))
@@ -1122,7 +1123,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 


	sk_setup_caps(sk, &rt->dst);



	new_saddr = fl4.saddr;

	new_saddr = fl4->saddr;



	if (new_saddr == old_saddr)

		return 0;
@@ -1152,7 +1153,7 @@ int inet_sk_rebuild_header(struct sock *sk) 
	struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0);

	__be32 daddr;

	struct ip_options_rcu *inet_opt;

	struct flowi4 fl4;

	struct flowi4 *fl4;

	int err;



	/* Route is OK, nothing to do. */
@@ -1166,7 +1167,8 @@ int inet_sk_rebuild_header(struct sock *sk) 
	if (inet_opt && inet_opt->opt.srr)

		daddr = inet_opt->opt.faddr;

	rcu_read_unlock();

	rt = ip_route_output_ports(sock_net(sk), &fl4, sk, daddr, inet->inet_saddr,

	fl4 = &inet->cork.fl.u.ip4;

	rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr, inet->inet_saddr,

				   inet->inet_dport, inet->inet_sport,

				   sk->sk_protocol, RT_CONN_FLAGS(sk),

				   sk->sk_bound_dev_if);