tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: David S. Miller <davem@davemloft.net>

David S. Miller fdbb0f07 6af88da1

+9 -7
+9 -7
net/l2tp/l2tp_ip.c
··· 298 298 { 299 299 struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr; 300 300 struct inet_sock *inet = inet_sk(sk); 301 - struct flowi4 fl4; 301 + struct flowi4 *fl4; 302 302 struct rtable *rt; 303 303 __be32 saddr; 304 304 int oif, rc; ··· 322 322 if (ipv4_is_multicast(lsa->l2tp_addr.s_addr)) 323 323 goto out; 324 324 325 - rt = ip_route_connect(&fl4, lsa->l2tp_addr.s_addr, saddr, 325 + fl4 = &inet->cork.fl.u.ip4; 326 + rt = ip_route_connect(fl4, lsa->l2tp_addr.s_addr, saddr, 326 327 RT_CONN_FLAGS(sk), oif, 327 328 IPPROTO_L2TP, 328 329 0, 0, sk, true); ··· 343 342 l2tp_ip_sk(sk)->peer_conn_id = lsa->l2tp_conn_id; 344 343 345 344 if (!inet->inet_saddr) 346 - inet->inet_saddr = fl4.saddr; 345 + inet->inet_saddr = fl4->saddr; 347 346 if (!inet->inet_rcv_saddr) 348 - inet->inet_rcv_saddr = fl4.saddr; 349 - inet->inet_daddr = fl4.daddr; 347 + inet->inet_rcv_saddr = fl4->saddr; 348 + inet->inet_daddr = fl4->daddr; 350 349 sk->sk_state = TCP_ESTABLISHED; 351 350 inet->inet_id = jiffies; 352 351 ··· 421 420 struct l2tp_ip_sock *lsa = l2tp_ip_sk(sk); 422 421 struct inet_sock *inet = inet_sk(sk); 423 422 struct rtable *rt = NULL; 423 + struct flowi4 *fl4; 424 424 int connected = 0; 425 425 __be32 daddr; 426 426 ··· 476 474 goto error; 477 475 } 478 476 477 + fl4 = &inet->cork.fl.u.ip4; 479 478 if (connected) 480 479 rt = (struct rtable *) __sk_dst_check(sk, 0); 481 480 482 481 if (rt == NULL) { 483 482 struct ip_options_rcu *inet_opt; 484 - struct flowi4 fl4; 485 483 486 484 rcu_read_lock(); 487 485 inet_opt = rcu_dereference(inet->inet_opt); ··· 496 494 * keep trying until route appears or the connection times 497 495 * itself out. 498 496 */ 499 - rt = ip_route_output_ports(sock_net(sk), &fl4, sk, 497 + rt = ip_route_output_ports(sock_net(sk), fl4, sk, 500 498 daddr, inet->inet_saddr, 501 499 inet->inet_dport, inet->inet_sport, 502 500 sk->sk_protocol, RT_CONN_FLAGS(sk),