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

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

l2tp: Use cork flow in l2tp_ip_connect() and l2tp_ip_sendmsg() 



Now that the socket is consistently locked in these two routines,
this transformation is legal.

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

net/l2tp/l2tp_ip.c

+9 −7
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len 
{

	struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr;

	struct inet_sock *inet = inet_sk(sk);

	struct flowi4 fl4;

	struct flowi4 *fl4;

	struct rtable *rt;

	__be32 saddr;

	int oif, rc;
@@ -322,7 +322,8 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len 
	if (ipv4_is_multicast(lsa->l2tp_addr.s_addr))

		goto out;



	rt = ip_route_connect(&fl4, lsa->l2tp_addr.s_addr, saddr,

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

	rt = ip_route_connect(fl4, lsa->l2tp_addr.s_addr, saddr,

			      RT_CONN_FLAGS(sk), oif,

			      IPPROTO_L2TP,

			      0, 0, sk, true);
@@ -342,10 +343,10 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len 
	l2tp_ip_sk(sk)->peer_conn_id = lsa->l2tp_conn_id;



	if (!inet->inet_saddr)

		inet->inet_saddr = fl4.saddr;

		inet->inet_saddr = fl4->saddr;

	if (!inet->inet_rcv_saddr)

		inet->inet_rcv_saddr = fl4.saddr;

	inet->inet_daddr = fl4.daddr;

		inet->inet_rcv_saddr = fl4->saddr;

	inet->inet_daddr = fl4->daddr;

	sk->sk_state = TCP_ESTABLISHED;

	inet->inet_id = jiffies;
@@ -420,6 +421,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m 
	struct l2tp_ip_sock *lsa = l2tp_ip_sk(sk);

	struct inet_sock *inet = inet_sk(sk);

	struct rtable *rt = NULL;

	struct flowi4 *fl4;

	int connected = 0;

	__be32 daddr;
@@ -474,12 +476,12 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m 
		goto error;

	}



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

	if (connected)

		rt = (struct rtable *) __sk_dst_check(sk, 0);



	if (rt == NULL) {

		struct ip_options_rcu *inet_opt;

		struct flowi4 fl4;



		rcu_read_lock();

		inet_opt = rcu_dereference(inet->inet_opt);
@@ -494,7 +496,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m 
		 * keep trying until route appears or the connection times

		 * itself out.

		 */

		rt = ip_route_output_ports(sock_net(sk), &fl4, sk,

		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),