tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ipv4: Lock socket and use cork flow in ip4_datagram_connect().
This is to make sure that an l2tp socket's inet cork flow is
fully filled in, when it's encapsulated in UDP.
Signed-off-by: David S. Miller <davem@davemloft.net>
+15
-8
+15
-8
net/ipv4/datagram.c
+15
-8
net/ipv4/datagram.c
···
24
24
{
25
25
struct inet_sock *inet = inet_sk(sk);
26
26
struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
27
-
struct flowi4 fl4;
27
+
struct flowi4 *fl4;
28
28
struct rtable *rt;
29
29
__be32 saddr;
30
30
int oif;
···
39
39
40
40
sk_dst_reset(sk);
41
41
42
+
lock_sock(sk);
43
+
42
44
oif = sk->sk_bound_dev_if;
43
45
saddr = inet->inet_saddr;
44
46
if (ipv4_is_multicast(usin->sin_addr.s_addr)) {
···
49
47
if (!saddr)
50
48
saddr = inet->mc_addr;
51
49
}
52
-
rt = ip_route_connect(&fl4, usin->sin_addr.s_addr, saddr,
50
+
fl4 = &inet->cork.fl.u.ip4;
51
+
rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr,
53
52
RT_CONN_FLAGS(sk), oif,
54
53
sk->sk_protocol,
55
54
inet->inet_sport, usin->sin_port, sk, true);
···
58
55
err = PTR_ERR(rt);
59
56
if (err == -ENETUNREACH)
60
57
IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
61
-
return err;
58
+
goto out;
62
59
}
63
60
64
61
if ((rt->rt_flags & RTCF_BROADCAST) && !sock_flag(sk, SOCK_BROADCAST)) {
65
62
ip_rt_put(rt);
66
-
return -EACCES;
63
+
err = -EACCES;
64
+
goto out;
67
65
}
68
66
if (!inet->inet_saddr)
69
-
inet->inet_saddr = fl4.saddr; /* Update source address */
67
+
inet->inet_saddr = fl4->saddr; /* Update source address */
70
68
if (!inet->inet_rcv_saddr) {
71
-
inet->inet_rcv_saddr = fl4.saddr;
69
+
inet->inet_rcv_saddr = fl4->saddr;
72
70
if (sk->sk_prot->rehash)
73
71
sk->sk_prot->rehash(sk);
74
72
}
75
-
inet->inet_daddr = fl4.daddr;
73
+
inet->inet_daddr = fl4->daddr;
76
74
inet->inet_dport = usin->sin_port;
77
75
sk->sk_state = TCP_ESTABLISHED;
78
76
inet->inet_id = jiffies;
79
77
80
78
sk_dst_set(sk, &rt->dst);
81
-
return 0;
79
+
err = 0;
80
+
out:
81
+
release_sock(sk);
82
+
return err;
82
83
}
83
84
EXPORT_SYMBOL(ip4_datagram_connect);