1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 * UDP over IPv6 3 * UDP over IPv6
4 * Linux INET6 implementation 4 * Linux INET6 implementation
5 * 5 *
6 * Authors: 6 * Authors:
7 * Pedro Roque <roque@di.fc.u 7 * Pedro Roque <roque@di.fc.ul.pt>
8 * 8 *
9 * Based on linux/ipv4/udp.c 9 * Based on linux/ipv4/udp.c
10 * 10 *
11 * Fixes: 11 * Fixes:
12 * Hideaki YOSHIFUJI : sin6_s 12 * Hideaki YOSHIFUJI : sin6_scope_id support
13 * YOSHIFUJI Hideaki @USAGI and: Suppor 13 * YOSHIFUJI Hideaki @USAGI and: Support IPV6_V6ONLY socket option, which
14 * Alexey Kuznetsov allow 14 * Alexey Kuznetsov allow both IPv4 and IPv6 sockets to bind
15 * a sing 15 * a single port at the same time.
16 * Kazunori MIYAZAWA @USAGI: change 16 * Kazunori MIYAZAWA @USAGI: change process style to use ip6_append_data
17 * YOSHIFUJI Hideaki @USAGI: conver 17 * YOSHIFUJI Hideaki @USAGI: convert /proc/net/udp6 to seq_file.
18 */ 18 */
19 19
20 #include <linux/bpf-cgroup.h> <<
21 #include <linux/errno.h> 20 #include <linux/errno.h>
22 #include <linux/types.h> 21 #include <linux/types.h>
23 #include <linux/socket.h> 22 #include <linux/socket.h>
24 #include <linux/sockios.h> 23 #include <linux/sockios.h>
25 #include <linux/net.h> 24 #include <linux/net.h>
26 #include <linux/in6.h> 25 #include <linux/in6.h>
27 #include <linux/netdevice.h> 26 #include <linux/netdevice.h>
28 #include <linux/if_arp.h> 27 #include <linux/if_arp.h>
29 #include <linux/ipv6.h> 28 #include <linux/ipv6.h>
30 #include <linux/icmpv6.h> 29 #include <linux/icmpv6.h>
31 #include <linux/init.h> 30 #include <linux/init.h>
32 #include <linux/module.h> 31 #include <linux/module.h>
33 #include <linux/skbuff.h> 32 #include <linux/skbuff.h>
34 #include <linux/slab.h> 33 #include <linux/slab.h>
35 #include <linux/uaccess.h> 34 #include <linux/uaccess.h>
36 #include <linux/indirect_call_wrapper.h> 35 #include <linux/indirect_call_wrapper.h>
37 #include <trace/events/udp.h> <<
38 36
39 #include <net/addrconf.h> 37 #include <net/addrconf.h>
40 #include <net/ndisc.h> 38 #include <net/ndisc.h>
41 #include <net/protocol.h> 39 #include <net/protocol.h>
42 #include <net/transp_v6.h> 40 #include <net/transp_v6.h>
43 #include <net/ip6_route.h> 41 #include <net/ip6_route.h>
44 #include <net/raw.h> 42 #include <net/raw.h>
45 #include <net/seg6.h> <<
46 #include <net/tcp_states.h> 43 #include <net/tcp_states.h>
47 #include <net/ip6_checksum.h> 44 #include <net/ip6_checksum.h>
48 #include <net/ip6_tunnel.h> 45 #include <net/ip6_tunnel.h>
49 #include <net/xfrm.h> 46 #include <net/xfrm.h>
50 #include <net/inet_hashtables.h> 47 #include <net/inet_hashtables.h>
51 #include <net/inet6_hashtables.h> 48 #include <net/inet6_hashtables.h>
52 #include <net/busy_poll.h> 49 #include <net/busy_poll.h>
53 #include <net/sock_reuseport.h> 50 #include <net/sock_reuseport.h>
54 #include <net/gro.h> <<
55 51
56 #include <linux/proc_fs.h> 52 #include <linux/proc_fs.h>
57 #include <linux/seq_file.h> 53 #include <linux/seq_file.h>
58 #include <trace/events/skb.h> 54 #include <trace/events/skb.h>
59 #include "udp_impl.h" 55 #include "udp_impl.h"
60 56
61 static void udpv6_destruct_sock(struct sock *s !! 57 static u32 udp6_ehashfn(const struct net *net,
>> 58 const struct in6_addr *laddr,
>> 59 const u16 lport,
>> 60 const struct in6_addr *faddr,
>> 61 const __be16 fport)
62 { 62 {
63 udp_destruct_common(sk); !! 63 static u32 udp6_ehash_secret __read_mostly;
64 inet6_sock_destruct(sk); !! 64 static u32 udp_ipv6_hash_secret __read_mostly;
65 } <<
66 65
67 int udpv6_init_sock(struct sock *sk) <<
68 { <<
69 udp_lib_init_sock(sk); <<
70 sk->sk_destruct = udpv6_destruct_sock; <<
71 set_bit(SOCK_SUPPORT_ZC, &sk->sk_socke <<
72 return 0; <<
73 } <<
74 <<
75 INDIRECT_CALLABLE_SCOPE <<
76 u32 udp6_ehashfn(const struct net *net, <<
77 const struct in6_addr *laddr, <<
78 const u16 lport, <<
79 const struct in6_addr *faddr, <<
80 const __be16 fport) <<
81 { <<
82 u32 lhash, fhash; 66 u32 lhash, fhash;
83 67
84 net_get_random_once(&udp6_ehash_secret 68 net_get_random_once(&udp6_ehash_secret,
85 sizeof(udp6_ehash_ 69 sizeof(udp6_ehash_secret));
86 net_get_random_once(&udp_ipv6_hash_sec 70 net_get_random_once(&udp_ipv6_hash_secret,
87 sizeof(udp_ipv6_ha 71 sizeof(udp_ipv6_hash_secret));
88 72
89 lhash = (__force u32)laddr->s6_addr32[ 73 lhash = (__force u32)laddr->s6_addr32[3];
90 fhash = __ipv6_addr_jhash(faddr, udp_i 74 fhash = __ipv6_addr_jhash(faddr, udp_ipv6_hash_secret);
91 75
92 return __inet6_ehashfn(lhash, lport, f 76 return __inet6_ehashfn(lhash, lport, fhash, fport,
93 udp6_ehash_secr !! 77 udp_ipv6_hash_secret + net_hash_mix(net));
94 } 78 }
95 79
96 int udp_v6_get_port(struct sock *sk, unsigned 80 int udp_v6_get_port(struct sock *sk, unsigned short snum)
97 { 81 {
98 unsigned int hash2_nulladdr = 82 unsigned int hash2_nulladdr =
99 ipv6_portaddr_hash(sock_net(sk 83 ipv6_portaddr_hash(sock_net(sk), &in6addr_any, snum);
100 unsigned int hash2_partial = 84 unsigned int hash2_partial =
101 ipv6_portaddr_hash(sock_net(sk 85 ipv6_portaddr_hash(sock_net(sk), &sk->sk_v6_rcv_saddr, 0);
102 86
103 /* precompute partial secondary hash * 87 /* precompute partial secondary hash */
104 udp_sk(sk)->udp_portaddr_hash = hash2_ 88 udp_sk(sk)->udp_portaddr_hash = hash2_partial;
105 return udp_lib_get_port(sk, snum, hash 89 return udp_lib_get_port(sk, snum, hash2_nulladdr);
106 } 90 }
107 91
108 void udp_v6_rehash(struct sock *sk) 92 void udp_v6_rehash(struct sock *sk)
109 { 93 {
110 u16 new_hash = ipv6_portaddr_hash(sock 94 u16 new_hash = ipv6_portaddr_hash(sock_net(sk),
111 &sk- 95 &sk->sk_v6_rcv_saddr,
112 inet 96 inet_sk(sk)->inet_num);
113 97
114 udp_lib_rehash(sk, new_hash); 98 udp_lib_rehash(sk, new_hash);
115 } 99 }
116 100
117 static int compute_score(struct sock *sk, cons !! 101 static int compute_score(struct sock *sk, struct net *net,
118 const struct in6_addr 102 const struct in6_addr *saddr, __be16 sport,
119 const struct in6_addr 103 const struct in6_addr *daddr, unsigned short hnum,
120 int dif, int sdif) 104 int dif, int sdif)
121 { 105 {
122 int bound_dev_if, score; !! 106 int score;
123 struct inet_sock *inet; 107 struct inet_sock *inet;
124 bool dev_match; 108 bool dev_match;
125 109
126 if (!net_eq(sock_net(sk), net) || 110 if (!net_eq(sock_net(sk), net) ||
127 udp_sk(sk)->udp_port_hash != hnum 111 udp_sk(sk)->udp_port_hash != hnum ||
128 sk->sk_family != PF_INET6) 112 sk->sk_family != PF_INET6)
129 return -1; 113 return -1;
130 114
131 if (!ipv6_addr_equal(&sk->sk_v6_rcv_sa 115 if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr))
132 return -1; 116 return -1;
133 117
134 score = 0; 118 score = 0;
135 inet = inet_sk(sk); 119 inet = inet_sk(sk);
136 120
137 if (inet->inet_dport) { 121 if (inet->inet_dport) {
138 if (inet->inet_dport != sport) 122 if (inet->inet_dport != sport)
139 return -1; 123 return -1;
140 score++; 124 score++;
141 } 125 }
142 126
143 if (!ipv6_addr_any(&sk->sk_v6_daddr)) 127 if (!ipv6_addr_any(&sk->sk_v6_daddr)) {
144 if (!ipv6_addr_equal(&sk->sk_v 128 if (!ipv6_addr_equal(&sk->sk_v6_daddr, saddr))
145 return -1; 129 return -1;
146 score++; 130 score++;
147 } 131 }
148 132
149 bound_dev_if = READ_ONCE(sk->sk_bound_ !! 133 dev_match = udp_sk_bound_dev_eq(net, sk->sk_bound_dev_if, dif, sdif);
150 dev_match = udp_sk_bound_dev_eq(net, b <<
151 if (!dev_match) 134 if (!dev_match)
152 return -1; 135 return -1;
153 if (bound_dev_if) !! 136 score++;
154 score++; <<
155 137
156 if (READ_ONCE(sk->sk_incoming_cpu) == 138 if (READ_ONCE(sk->sk_incoming_cpu) == raw_smp_processor_id())
157 score++; 139 score++;
158 140
159 return score; 141 return score;
160 } 142 }
161 143
162 /* called with rcu_read_lock() */ 144 /* called with rcu_read_lock() */
163 static struct sock *udp6_lib_lookup2(const str !! 145 static struct sock *udp6_lib_lookup2(struct net *net,
164 const struct in6_addr *saddr, 146 const struct in6_addr *saddr, __be16 sport,
165 const struct in6_addr *daddr, 147 const struct in6_addr *daddr, unsigned int hnum,
166 int dif, int sdif, struct udp_ 148 int dif, int sdif, struct udp_hslot *hslot2,
167 struct sk_buff *skb) 149 struct sk_buff *skb)
168 { 150 {
169 struct sock *sk, *result; !! 151 struct sock *sk, *result, *reuseport_result;
170 int score, badness; 152 int score, badness;
171 bool need_rescore; !! 153 u32 hash = 0;
172 154
173 result = NULL; 155 result = NULL;
174 badness = -1; 156 badness = -1;
175 udp_portaddr_for_each_entry_rcu(sk, &h 157 udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {
176 need_rescore = false; !! 158 score = compute_score(sk, net, saddr, sport,
177 rescore: !! 159 daddr, hnum, dif, sdif);
178 score = compute_score(need_res <<
179 sport, d <<
180 if (score > badness) { 160 if (score > badness) {
181 badness = score; !! 161 reuseport_result = NULL;
182 <<
183 if (need_rescore) <<
184 continue; <<
185 <<
186 if (sk->sk_state == TC <<
187 result = sk; <<
188 continue; <<
189 } <<
190 162
191 result = inet6_lookup_ !! 163 if (sk->sk_reuseport &&
192 !! 164 sk->sk_state != TCP_ESTABLISHED) {
193 if (!result) { !! 165 hash = udp6_ehashfn(net, daddr, hnum,
194 result = sk; !! 166 saddr, sport);
195 continue; !! 167
>> 168 reuseport_result = reuseport_select_sock(sk, hash, skb,
>> 169 sizeof(struct udphdr));
>> 170 if (reuseport_result && !reuseport_has_conns(sk, false))
>> 171 return reuseport_result;
196 } 172 }
197 173
198 /* Fall back to scorin !! 174 result = reuseport_result ? : sk;
199 if (!reuseport_has_con !! 175 badness = score;
200 return result; <<
201 <<
202 /* Reuseport logic ret <<
203 if (IS_ERR(result)) <<
204 continue; <<
205 <<
206 /* compute_score is to <<
207 * inlined, and callin <<
208 * measureable overhea <<
209 * workloads. Work aro <<
210 * backwards to rescor <<
211 */ <<
212 need_rescore = true; <<
213 goto rescore; <<
214 } 176 }
215 } 177 }
216 return result; 178 return result;
217 } 179 }
218 180
219 /* rcu_read_lock() must be held */ 181 /* rcu_read_lock() must be held */
220 struct sock *__udp6_lib_lookup(const struct ne !! 182 struct sock *__udp6_lib_lookup(struct net *net,
221 const struct in 183 const struct in6_addr *saddr, __be16 sport,
222 const struct in 184 const struct in6_addr *daddr, __be16 dport,
223 int dif, int sd 185 int dif, int sdif, struct udp_table *udptable,
224 struct sk_buff 186 struct sk_buff *skb)
225 { 187 {
226 unsigned short hnum = ntohs(dport); 188 unsigned short hnum = ntohs(dport);
227 unsigned int hash2, slot2; 189 unsigned int hash2, slot2;
228 struct udp_hslot *hslot2; 190 struct udp_hslot *hslot2;
229 struct sock *result, *sk; !! 191 struct sock *result;
230 192
231 hash2 = ipv6_portaddr_hash(net, daddr, 193 hash2 = ipv6_portaddr_hash(net, daddr, hnum);
232 slot2 = hash2 & udptable->mask; 194 slot2 = hash2 & udptable->mask;
233 hslot2 = &udptable->hash2[slot2]; 195 hslot2 = &udptable->hash2[slot2];
234 196
235 /* Lookup connected or non-wildcard so <<
236 result = udp6_lib_lookup2(net, saddr, 197 result = udp6_lib_lookup2(net, saddr, sport,
237 daddr, hnum, 198 daddr, hnum, dif, sdif,
238 hslot2, skb) 199 hslot2, skb);
239 if (!IS_ERR_OR_NULL(result) && result- !! 200 if (!result) {
240 goto done; !! 201 hash2 = ipv6_portaddr_hash(net, &in6addr_any, hnum);
241 !! 202 slot2 = hash2 & udptable->mask;
242 /* Lookup redirect from BPF */ !! 203
243 if (static_branch_unlikely(&bpf_sk_loo !! 204 hslot2 = &udptable->hash2[slot2];
244 udptable == net->ipv4.udp_table) { !! 205
245 sk = inet6_lookup_run_sk_looku !! 206 result = udp6_lib_lookup2(net, saddr, sport,
246 !! 207 &in6addr_any, hnum, dif, sdif,
247 !! 208 hslot2, skb);
248 if (sk) { <<
249 result = sk; <<
250 goto done; <<
251 } <<
252 } 209 }
253 <<
254 /* Got non-wildcard socket or error on <<
255 if (result) <<
256 goto done; <<
257 <<
258 /* Lookup wildcard sockets */ <<
259 hash2 = ipv6_portaddr_hash(net, &in6ad <<
260 slot2 = hash2 & udptable->mask; <<
261 hslot2 = &udptable->hash2[slot2]; <<
262 <<
263 result = udp6_lib_lookup2(net, saddr, <<
264 &in6addr_any <<
265 hslot2, skb) <<
266 done: <<
267 if (IS_ERR(result)) 210 if (IS_ERR(result))
268 return NULL; 211 return NULL;
269 return result; 212 return result;
270 } 213 }
271 EXPORT_SYMBOL_GPL(__udp6_lib_lookup); 214 EXPORT_SYMBOL_GPL(__udp6_lib_lookup);
272 215
273 static struct sock *__udp6_lib_lookup_skb(stru 216 static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
274 __be 217 __be16 sport, __be16 dport,
275 stru 218 struct udp_table *udptable)
276 { 219 {
277 const struct ipv6hdr *iph = ipv6_hdr(s 220 const struct ipv6hdr *iph = ipv6_hdr(skb);
278 221
279 return __udp6_lib_lookup(dev_net(skb-> 222 return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,
280 &iph->daddr, 223 &iph->daddr, dport, inet6_iif(skb),
281 inet6_sdif(sk 224 inet6_sdif(skb), udptable, skb);
282 } 225 }
283 226
284 struct sock *udp6_lib_lookup_skb(const struct !! 227 struct sock *udp6_lib_lookup_skb(struct sk_buff *skb,
285 __be16 sport, 228 __be16 sport, __be16 dport)
286 { 229 {
287 const u16 offset = NAPI_GRO_CB(skb)->n !! 230 const struct ipv6hdr *iph = ipv6_hdr(skb);
288 const struct ipv6hdr *iph = (struct ip <<
289 struct net *net = dev_net(skb->dev); <<
290 int iif, sdif; <<
291 <<
292 inet6_get_iif_sdif(skb, &iif, &sdif); <<
293 231
294 return __udp6_lib_lookup(net, &iph->sa !! 232 return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,
295 &iph->daddr, !! 233 &iph->daddr, dport, inet6_iif(skb),
296 sdif, net->ip !! 234 inet6_sdif(skb), &udp_table, NULL);
297 } 235 }
>> 236 EXPORT_SYMBOL_GPL(udp6_lib_lookup_skb);
298 237
299 /* Must be called under rcu_read_lock(). 238 /* Must be called under rcu_read_lock().
300 * Does increment socket refcount. 239 * Does increment socket refcount.
301 */ 240 */
302 #if IS_ENABLED(CONFIG_NF_TPROXY_IPV6) || IS_EN 241 #if IS_ENABLED(CONFIG_NF_TPROXY_IPV6) || IS_ENABLED(CONFIG_NF_SOCKET_IPV6)
303 struct sock *udp6_lib_lookup(const struct net !! 242 struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,
304 const struct in6_ 243 const struct in6_addr *daddr, __be16 dport, int dif)
305 { 244 {
306 struct sock *sk; 245 struct sock *sk;
307 246
308 sk = __udp6_lib_lookup(net, saddr, sp 247 sk = __udp6_lib_lookup(net, saddr, sport, daddr, dport,
309 dif, 0, net->i !! 248 dif, 0, &udp_table, NULL);
310 if (sk && !refcount_inc_not_zero(&sk-> 249 if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))
311 sk = NULL; 250 sk = NULL;
312 return sk; 251 return sk;
313 } 252 }
314 EXPORT_SYMBOL_GPL(udp6_lib_lookup); 253 EXPORT_SYMBOL_GPL(udp6_lib_lookup);
315 #endif 254 #endif
316 255
317 /* do not use the scratch area len for jumbogr 256 /* do not use the scratch area len for jumbogram: their length execeeds the
318 * scratch area space; note that the IP6CB fla 257 * scratch area space; note that the IP6CB flags is still in the first
319 * cacheline, so checking for jumbograms is ch 258 * cacheline, so checking for jumbograms is cheap
320 */ 259 */
321 static int udp6_skb_len(struct sk_buff *skb) 260 static int udp6_skb_len(struct sk_buff *skb)
322 { 261 {
323 return unlikely(inet6_is_jumbogram(skb 262 return unlikely(inet6_is_jumbogram(skb)) ? skb->len : udp_skb_len(skb);
324 } 263 }
325 264
326 /* 265 /*
327 * This should be easy, if there is somet 266 * This should be easy, if there is something there we
328 * return it, otherwise we block. 267 * return it, otherwise we block.
329 */ 268 */
330 269
331 int udpv6_recvmsg(struct sock *sk, struct msgh 270 int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
332 int flags, int *addr_len) !! 271 int noblock, int flags, int *addr_len)
333 { 272 {
334 struct ipv6_pinfo *np = inet6_sk(sk); 273 struct ipv6_pinfo *np = inet6_sk(sk);
335 struct inet_sock *inet = inet_sk(sk); 274 struct inet_sock *inet = inet_sk(sk);
336 struct sk_buff *skb; 275 struct sk_buff *skb;
337 unsigned int ulen, copied; 276 unsigned int ulen, copied;
338 int off, err, peeking = flags & MSG_PE 277 int off, err, peeking = flags & MSG_PEEK;
339 int is_udplite = IS_UDPLITE(sk); 278 int is_udplite = IS_UDPLITE(sk);
340 struct udp_mib __percpu *mib; 279 struct udp_mib __percpu *mib;
341 bool checksum_valid = false; 280 bool checksum_valid = false;
342 int is_udp4; 281 int is_udp4;
343 282
344 if (flags & MSG_ERRQUEUE) 283 if (flags & MSG_ERRQUEUE)
345 return ipv6_recv_error(sk, msg 284 return ipv6_recv_error(sk, msg, len, addr_len);
346 285
347 if (np->rxpmtu && np->rxopt.bits.rxpmt 286 if (np->rxpmtu && np->rxopt.bits.rxpmtu)
348 return ipv6_recv_rxpmtu(sk, ms 287 return ipv6_recv_rxpmtu(sk, msg, len, addr_len);
349 288
350 try_again: 289 try_again:
351 off = sk_peek_offset(sk, flags); 290 off = sk_peek_offset(sk, flags);
352 skb = __skb_recv_udp(sk, flags, &off, !! 291 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
353 if (!skb) 292 if (!skb)
354 return err; 293 return err;
355 if (ccs_socket_post_recvmsg_permission 294 if (ccs_socket_post_recvmsg_permission(sk, skb, flags))
356 return -EAGAIN; /* Hope less h 295 return -EAGAIN; /* Hope less harmful than -EPERM. */
357 296
358 ulen = udp6_skb_len(skb); 297 ulen = udp6_skb_len(skb);
359 copied = len; 298 copied = len;
360 if (copied > ulen - off) 299 if (copied > ulen - off)
361 copied = ulen - off; 300 copied = ulen - off;
362 else if (copied < ulen) 301 else if (copied < ulen)
363 msg->msg_flags |= MSG_TRUNC; 302 msg->msg_flags |= MSG_TRUNC;
364 303
365 is_udp4 = (skb->protocol == htons(ETH_ 304 is_udp4 = (skb->protocol == htons(ETH_P_IP));
366 mib = __UDPX_MIB(sk, is_udp4); 305 mib = __UDPX_MIB(sk, is_udp4);
367 306
368 /* 307 /*
369 * If checksum is needed at all, try t 308 * If checksum is needed at all, try to do it while copying the
370 * data. If the data is truncated, or 309 * data. If the data is truncated, or if we only want a partial
371 * coverage checksum (UDP-Lite), do it 310 * coverage checksum (UDP-Lite), do it before the copy.
372 */ 311 */
373 312
374 if (copied < ulen || peeking || 313 if (copied < ulen || peeking ||
375 (is_udplite && UDP_SKB_CB(skb)->pa 314 (is_udplite && UDP_SKB_CB(skb)->partial_cov)) {
376 checksum_valid = udp_skb_csum_ 315 checksum_valid = udp_skb_csum_unnecessary(skb) ||
377 !__udp_lib_che 316 !__udp_lib_checksum_complete(skb);
378 if (!checksum_valid) 317 if (!checksum_valid)
379 goto csum_copy_err; 318 goto csum_copy_err;
380 } 319 }
381 320
382 if (checksum_valid || udp_skb_csum_unn 321 if (checksum_valid || udp_skb_csum_unnecessary(skb)) {
383 if (udp_skb_is_linear(skb)) 322 if (udp_skb_is_linear(skb))
384 err = copy_linear_skb( 323 err = copy_linear_skb(skb, copied, off, &msg->msg_iter);
385 else 324 else
386 err = skb_copy_datagra 325 err = skb_copy_datagram_msg(skb, off, msg, copied);
387 } else { 326 } else {
388 err = skb_copy_and_csum_datagr 327 err = skb_copy_and_csum_datagram_msg(skb, off, msg);
389 if (err == -EINVAL) 328 if (err == -EINVAL)
390 goto csum_copy_err; 329 goto csum_copy_err;
391 } 330 }
392 if (unlikely(err)) { 331 if (unlikely(err)) {
393 if (!peeking) { 332 if (!peeking) {
394 atomic_inc(&sk->sk_dro 333 atomic_inc(&sk->sk_drops);
395 SNMP_INC_STATS(mib, UD 334 SNMP_INC_STATS(mib, UDP_MIB_INERRORS);
396 } 335 }
397 kfree_skb(skb); 336 kfree_skb(skb);
398 return err; 337 return err;
399 } 338 }
400 if (!peeking) 339 if (!peeking)
401 SNMP_INC_STATS(mib, UDP_MIB_IN 340 SNMP_INC_STATS(mib, UDP_MIB_INDATAGRAMS);
402 341
403 sock_recv_cmsgs(msg, sk, skb); !! 342 sock_recv_ts_and_drops(msg, sk, skb);
404 343
405 /* Copy the address. */ 344 /* Copy the address. */
406 if (msg->msg_name) { 345 if (msg->msg_name) {
407 DECLARE_SOCKADDR(struct sockad 346 DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name);
408 sin6->sin6_family = AF_INET6; 347 sin6->sin6_family = AF_INET6;
409 sin6->sin6_port = udp_hdr(skb) 348 sin6->sin6_port = udp_hdr(skb)->source;
410 sin6->sin6_flowinfo = 0; 349 sin6->sin6_flowinfo = 0;
411 350
412 if (is_udp4) { 351 if (is_udp4) {
413 ipv6_addr_set_v4mapped 352 ipv6_addr_set_v4mapped(ip_hdr(skb)->saddr,
414 353 &sin6->sin6_addr);
415 sin6->sin6_scope_id = 354 sin6->sin6_scope_id = 0;
416 } else { 355 } else {
417 sin6->sin6_addr = ipv6 356 sin6->sin6_addr = ipv6_hdr(skb)->saddr;
418 sin6->sin6_scope_id = 357 sin6->sin6_scope_id =
419 ipv6_iface_sco 358 ipv6_iface_scope_id(&sin6->sin6_addr,
420 359 inet6_iif(skb));
421 } 360 }
422 *addr_len = sizeof(*sin6); 361 *addr_len = sizeof(*sin6);
423 362
424 BPF_CGROUP_RUN_PROG_UDP6_RECVM !! 363 if (cgroup_bpf_enabled)
425 !! 364 BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK(sk,
426 !! 365 (struct sockaddr *)sin6);
427 } 366 }
428 367
429 if (udp_test_bit(GRO_ENABLED, sk)) !! 368 if (udp_sk(sk)->gro_enabled)
430 udp_cmsg_recv(msg, sk, skb); 369 udp_cmsg_recv(msg, sk, skb);
431 370
432 if (np->rxopt.all) 371 if (np->rxopt.all)
433 ip6_datagram_recv_common_ctl(s 372 ip6_datagram_recv_common_ctl(sk, msg, skb);
434 373
435 if (is_udp4) { 374 if (is_udp4) {
436 if (inet_cmsg_flags(inet)) !! 375 if (inet->cmsg_flags)
437 ip_cmsg_recv_offset(ms 376 ip_cmsg_recv_offset(msg, sk, skb,
438 si 377 sizeof(struct udphdr), off);
439 } else { 378 } else {
440 if (np->rxopt.all) 379 if (np->rxopt.all)
441 ip6_datagram_recv_spec 380 ip6_datagram_recv_specific_ctl(sk, msg, skb);
442 } 381 }
443 382
444 err = copied; 383 err = copied;
445 if (flags & MSG_TRUNC) 384 if (flags & MSG_TRUNC)
446 err = ulen; 385 err = ulen;
447 386
448 skb_consume_udp(sk, skb, peeking ? -er 387 skb_consume_udp(sk, skb, peeking ? -err : err);
449 return err; 388 return err;
450 389
451 csum_copy_err: 390 csum_copy_err:
452 if (!__sk_queue_drop_skb(sk, &udp_sk(s 391 if (!__sk_queue_drop_skb(sk, &udp_sk(sk)->reader_queue, skb, flags,
453 udp_skb_destr 392 udp_skb_destructor)) {
454 SNMP_INC_STATS(mib, UDP_MIB_CS 393 SNMP_INC_STATS(mib, UDP_MIB_CSUMERRORS);
455 SNMP_INC_STATS(mib, UDP_MIB_IN 394 SNMP_INC_STATS(mib, UDP_MIB_INERRORS);
456 } 395 }
457 kfree_skb(skb); 396 kfree_skb(skb);
458 397
459 /* starting over for a new packet, but 398 /* starting over for a new packet, but check if we need to yield */
460 cond_resched(); 399 cond_resched();
461 msg->msg_flags &= ~MSG_TRUNC; 400 msg->msg_flags &= ~MSG_TRUNC;
462 goto try_again; 401 goto try_again;
463 } 402 }
464 403
465 DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_ke !! 404 DEFINE_STATIC_KEY_FALSE(udpv6_encap_needed_key);
466 void udpv6_encap_enable(void) 405 void udpv6_encap_enable(void)
467 { 406 {
468 static_branch_inc(&udpv6_encap_needed_ 407 static_branch_inc(&udpv6_encap_needed_key);
469 } 408 }
470 EXPORT_SYMBOL(udpv6_encap_enable); 409 EXPORT_SYMBOL(udpv6_encap_enable);
471 410
472 /* Handler for tunnels with arbitrary destinat 411 /* Handler for tunnels with arbitrary destination ports: no socket lookup, go
473 * through error handlers in encapsulations lo 412 * through error handlers in encapsulations looking for a match.
474 */ 413 */
475 static int __udp6_lib_err_encap_no_sk(struct s 414 static int __udp6_lib_err_encap_no_sk(struct sk_buff *skb,
476 struct i 415 struct inet6_skb_parm *opt,
477 u8 type, 416 u8 type, u8 code, int offset, __be32 info)
478 { 417 {
479 int i; 418 int i;
480 419
481 for (i = 0; i < MAX_IPTUN_ENCAP_OPS; i 420 for (i = 0; i < MAX_IPTUN_ENCAP_OPS; i++) {
482 int (*handler)(struct sk_buff 421 int (*handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,
483 u8 type, u8 cod 422 u8 type, u8 code, int offset, __be32 info);
484 const struct ip6_tnl_encap_ops 423 const struct ip6_tnl_encap_ops *encap;
485 424
486 encap = rcu_dereference(ip6tun 425 encap = rcu_dereference(ip6tun_encaps[i]);
487 if (!encap) 426 if (!encap)
488 continue; 427 continue;
489 handler = encap->err_handler; 428 handler = encap->err_handler;
490 if (handler && !handler(skb, o 429 if (handler && !handler(skb, opt, type, code, offset, info))
491 return 0; 430 return 0;
492 } 431 }
493 432
494 return -ENOENT; 433 return -ENOENT;
495 } 434 }
496 435
497 /* Try to match ICMP errors to UDP tunnels by 436 /* Try to match ICMP errors to UDP tunnels by looking up a socket without
498 * reversing source and destination port: this 437 * reversing source and destination port: this will match tunnels that force the
499 * same destination port on both endpoints (e. 438 * same destination port on both endpoints (e.g. VXLAN, GENEVE). Note that
500 * lwtunnels might actually break this assumpt 439 * lwtunnels might actually break this assumption by being configured with
501 * different destination ports on endpoints, i 440 * different destination ports on endpoints, in this case we won't be able to
502 * trace ICMP messages back to them. 441 * trace ICMP messages back to them.
503 * 442 *
504 * If this doesn't match any socket, probe tun 443 * If this doesn't match any socket, probe tunnels with arbitrary destination
505 * ports (e.g. FoU, GUE): there, the receiving 444 * ports (e.g. FoU, GUE): there, the receiving socket is useless, as the port
506 * we've sent packets to won't necessarily mat 445 * we've sent packets to won't necessarily match the local destination port.
507 * 446 *
508 * Then ask the tunnel implementation to match 447 * Then ask the tunnel implementation to match the error against a valid
509 * association. 448 * association.
510 * 449 *
511 * Return an error if we can't find a match, t 450 * Return an error if we can't find a match, the socket if we need further
512 * processing, zero otherwise. 451 * processing, zero otherwise.
513 */ 452 */
514 static struct sock *__udp6_lib_err_encap(struc 453 static struct sock *__udp6_lib_err_encap(struct net *net,
515 const 454 const struct ipv6hdr *hdr, int offset,
516 struc 455 struct udphdr *uh,
517 struc 456 struct udp_table *udptable,
518 struc <<
519 struc 457 struct sk_buff *skb,
520 struc 458 struct inet6_skb_parm *opt,
521 u8 ty 459 u8 type, u8 code, __be32 info)
522 { 460 {
523 int (*lookup)(struct sock *sk, struct <<
524 int network_offset, transport_offset; 461 int network_offset, transport_offset;
525 struct udp_sock *up; !! 462 struct sock *sk;
526 463
527 network_offset = skb_network_offset(sk 464 network_offset = skb_network_offset(skb);
528 transport_offset = skb_transport_offse 465 transport_offset = skb_transport_offset(skb);
529 466
530 /* Network header needs to point to th 467 /* Network header needs to point to the outer IPv6 header inside ICMP */
531 skb_reset_network_header(skb); 468 skb_reset_network_header(skb);
532 469
533 /* Transport header needs to point to 470 /* Transport header needs to point to the UDP header */
534 skb_set_transport_header(skb, offset); 471 skb_set_transport_header(skb, offset);
535 472
536 if (sk) { <<
537 up = udp_sk(sk); <<
538 <<
539 lookup = READ_ONCE(up->encap_e <<
540 if (lookup && lookup(sk, skb)) <<
541 sk = NULL; <<
542 <<
543 goto out; <<
544 } <<
545 <<
546 sk = __udp6_lib_lookup(net, &hdr->dadd 473 sk = __udp6_lib_lookup(net, &hdr->daddr, uh->source,
547 &hdr->saddr, uh 474 &hdr->saddr, uh->dest,
548 inet6_iif(skb), 475 inet6_iif(skb), 0, udptable, skb);
549 if (sk) { 476 if (sk) {
550 up = udp_sk(sk); !! 477 int (*lookup)(struct sock *sk, struct sk_buff *skb);
>> 478 struct udp_sock *up = udp_sk(sk);
551 479
552 lookup = READ_ONCE(up->encap_e 480 lookup = READ_ONCE(up->encap_err_lookup);
553 if (!lookup || lookup(sk, skb) 481 if (!lookup || lookup(sk, skb))
554 sk = NULL; 482 sk = NULL;
555 } 483 }
556 484
557 out: <<
558 if (!sk) { 485 if (!sk) {
559 sk = ERR_PTR(__udp6_lib_err_en 486 sk = ERR_PTR(__udp6_lib_err_encap_no_sk(skb, opt, type, code,
560 487 offset, info));
561 } 488 }
562 489
563 skb_set_transport_header(skb, transpor 490 skb_set_transport_header(skb, transport_offset);
564 skb_set_network_header(skb, network_of 491 skb_set_network_header(skb, network_offset);
565 492
566 return sk; 493 return sk;
567 } 494 }
568 495
569 int __udp6_lib_err(struct sk_buff *skb, struct 496 int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
570 u8 type, u8 code, int offse 497 u8 type, u8 code, int offset, __be32 info,
571 struct udp_table *udptable) 498 struct udp_table *udptable)
572 { 499 {
573 struct ipv6_pinfo *np; 500 struct ipv6_pinfo *np;
574 const struct ipv6hdr *hdr = (const str 501 const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
575 const struct in6_addr *saddr = &hdr->s 502 const struct in6_addr *saddr = &hdr->saddr;
576 const struct in6_addr *daddr = seg6_ge !! 503 const struct in6_addr *daddr = &hdr->daddr;
577 struct udphdr *uh = (struct udphdr *)( 504 struct udphdr *uh = (struct udphdr *)(skb->data+offset);
578 bool tunnel = false; 505 bool tunnel = false;
579 struct sock *sk; 506 struct sock *sk;
580 int harderr; 507 int harderr;
581 int err; 508 int err;
582 struct net *net = dev_net(skb->dev); 509 struct net *net = dev_net(skb->dev);
583 510
584 sk = __udp6_lib_lookup(net, daddr, uh- 511 sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,
585 inet6_iif(skb), 512 inet6_iif(skb), inet6_sdif(skb), udptable, NULL);
586 !! 513 if (!sk) {
587 if (!sk || READ_ONCE(udp_sk(sk)->encap <<
588 /* No socket for error: try tu 514 /* No socket for error: try tunnels before discarding */
>> 515 sk = ERR_PTR(-ENOENT);
589 if (static_branch_unlikely(&ud 516 if (static_branch_unlikely(&udpv6_encap_needed_key)) {
590 sk = __udp6_lib_err_en 517 sk = __udp6_lib_err_encap(net, hdr, offset, uh,
591 !! 518 udptable, skb,
592 519 opt, type, code, info);
593 if (!sk) 520 if (!sk)
594 return 0; 521 return 0;
595 } else !! 522 }
596 sk = ERR_PTR(-ENOENT); <<
597 523
598 if (IS_ERR(sk)) { 524 if (IS_ERR(sk)) {
599 __ICMP6_INC_STATS(net, 525 __ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),
600 ICMP 526 ICMP6_MIB_INERRORS);
601 return PTR_ERR(sk); 527 return PTR_ERR(sk);
602 } 528 }
603 529
604 tunnel = true; 530 tunnel = true;
605 } 531 }
606 532
607 harderr = icmpv6_err_convert(type, cod 533 harderr = icmpv6_err_convert(type, code, &err);
608 np = inet6_sk(sk); 534 np = inet6_sk(sk);
609 535
610 if (type == ICMPV6_PKT_TOOBIG) { 536 if (type == ICMPV6_PKT_TOOBIG) {
611 if (!ip6_sk_accept_pmtu(sk)) 537 if (!ip6_sk_accept_pmtu(sk))
612 goto out; 538 goto out;
613 ip6_sk_update_pmtu(skb, sk, in 539 ip6_sk_update_pmtu(skb, sk, info);
614 if (READ_ONCE(np->pmtudisc) != !! 540 if (np->pmtudisc != IPV6_PMTUDISC_DONT)
615 harderr = 1; 541 harderr = 1;
616 } 542 }
617 if (type == NDISC_REDIRECT) { 543 if (type == NDISC_REDIRECT) {
618 if (tunnel) { 544 if (tunnel) {
619 ip6_redirect(skb, sock 545 ip6_redirect(skb, sock_net(sk), inet6_iif(skb),
620 READ_ONCE !! 546 sk->sk_mark, sk->sk_uid);
621 } else { 547 } else {
622 ip6_sk_redirect(skb, s 548 ip6_sk_redirect(skb, sk);
623 } 549 }
624 goto out; 550 goto out;
625 } 551 }
626 552
627 /* Tunnels don't have an application s 553 /* Tunnels don't have an application socket: don't pass errors back */
628 if (tunnel) { !! 554 if (tunnel)
629 if (udp_sk(sk)->encap_err_rcv) <<
630 udp_sk(sk)->encap_err_ <<
631 <<
632 goto out; 555 goto out;
633 } <<
634 556
635 if (!inet6_test_bit(RECVERR6, sk)) { !! 557 if (!np->recverr) {
636 if (!harderr || sk->sk_state ! 558 if (!harderr || sk->sk_state != TCP_ESTABLISHED)
637 goto out; 559 goto out;
638 } else { 560 } else {
639 ipv6_icmp_error(sk, skb, err, 561 ipv6_icmp_error(sk, skb, err, uh->dest, ntohl(info), (u8 *)(uh+1));
640 } 562 }
641 563
642 sk->sk_err = err; 564 sk->sk_err = err;
643 sk_error_report(sk); !! 565 sk->sk_error_report(sk);
644 out: 566 out:
645 return 0; 567 return 0;
646 } 568 }
647 569
648 static int __udpv6_queue_rcv_skb(struct sock * 570 static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
649 { 571 {
650 int rc; 572 int rc;
651 573
652 if (!ipv6_addr_any(&sk->sk_v6_daddr)) 574 if (!ipv6_addr_any(&sk->sk_v6_daddr)) {
653 sock_rps_save_rxhash(sk, skb); 575 sock_rps_save_rxhash(sk, skb);
654 sk_mark_napi_id(sk, skb); 576 sk_mark_napi_id(sk, skb);
655 sk_incoming_cpu_update(sk); 577 sk_incoming_cpu_update(sk);
656 } else { 578 } else {
657 sk_mark_napi_id_once(sk, skb); 579 sk_mark_napi_id_once(sk, skb);
658 } 580 }
659 581
660 rc = __udp_enqueue_schedule_skb(sk, sk 582 rc = __udp_enqueue_schedule_skb(sk, skb);
661 if (rc < 0) { 583 if (rc < 0) {
662 int is_udplite = IS_UDPLITE(sk 584 int is_udplite = IS_UDPLITE(sk);
663 enum skb_drop_reason drop_reas <<
664 585
665 /* Note that an ENOMEM error i 586 /* Note that an ENOMEM error is charged twice */
666 if (rc == -ENOMEM) { !! 587 if (rc == -ENOMEM)
667 UDP6_INC_STATS(sock_ne 588 UDP6_INC_STATS(sock_net(sk),
668 UDP_M 589 UDP_MIB_RCVBUFERRORS, is_udplite);
669 drop_reason = SKB_DROP <<
670 } else { <<
671 UDP6_INC_STATS(sock_ne <<
672 UDP_MIB <<
673 drop_reason = SKB_DROP <<
674 } <<
675 UDP6_INC_STATS(sock_net(sk), U 590 UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
676 trace_udp_fail_queue_rcv_skb(r !! 591 kfree_skb(skb);
677 sk_skb_reason_drop(sk, skb, dr <<
678 return -1; 592 return -1;
679 } 593 }
680 594
681 return 0; 595 return 0;
682 } 596 }
683 597
684 static __inline__ int udpv6_err(struct sk_buff 598 static __inline__ int udpv6_err(struct sk_buff *skb,
685 struct inet6_s 599 struct inet6_skb_parm *opt, u8 type,
686 u8 code, int o 600 u8 code, int offset, __be32 info)
687 { 601 {
688 return __udp6_lib_err(skb, opt, type, !! 602 return __udp6_lib_err(skb, opt, type, code, offset, info, &udp_table);
689 dev_net(skb->dev <<
690 } 603 }
691 604
692 static int udpv6_queue_rcv_one_skb(struct sock 605 static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
693 { 606 {
694 enum skb_drop_reason drop_reason = SKB <<
695 struct udp_sock *up = udp_sk(sk); 607 struct udp_sock *up = udp_sk(sk);
696 int is_udplite = IS_UDPLITE(sk); 608 int is_udplite = IS_UDPLITE(sk);
697 609
698 if (!xfrm6_policy_check(sk, XFRM_POLIC !! 610 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
699 drop_reason = SKB_DROP_REASON_ <<
700 goto drop; 611 goto drop;
701 } <<
702 nf_reset_ct(skb); <<
703 612
704 if (static_branch_unlikely(&udpv6_enca !! 613 if (static_branch_unlikely(&udpv6_encap_needed_key) && up->encap_type) {
705 READ_ONCE(up->encap_type)) { <<
706 int (*encap_rcv)(struct sock * 614 int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
707 615
708 /* 616 /*
709 * This is an encapsulation so 617 * This is an encapsulation socket so pass the skb to
710 * the socket's udp_encap_rcv( 618 * the socket's udp_encap_rcv() hook. Otherwise, just
711 * fall through and pass this 619 * fall through and pass this up the UDP socket.
712 * up->encap_rcv() returns the 620 * up->encap_rcv() returns the following value:
713 * =0 if skb was successfully 621 * =0 if skb was successfully passed to the encap
714 * handler or was discarded 622 * handler or was discarded by it.
715 * >0 if skb should be passed 623 * >0 if skb should be passed on to UDP.
716 * <0 if skb should be resubmi 624 * <0 if skb should be resubmitted as proto -N
717 */ 625 */
718 626
719 /* if we're overly short, let 627 /* if we're overly short, let UDP handle it */
720 encap_rcv = READ_ONCE(up->enca 628 encap_rcv = READ_ONCE(up->encap_rcv);
721 if (encap_rcv) { 629 if (encap_rcv) {
722 int ret; 630 int ret;
723 631
724 /* Verify checksum bef 632 /* Verify checksum before giving to encap */
725 if (udp_lib_checksum_c 633 if (udp_lib_checksum_complete(skb))
726 goto csum_erro 634 goto csum_error;
727 635
728 ret = encap_rcv(sk, sk 636 ret = encap_rcv(sk, skb);
729 if (ret <= 0) { 637 if (ret <= 0) {
730 __UDP6_INC_STA !! 638 __UDP_INC_STATS(sock_net(sk),
731 !! 639 UDP_MIB_INDATAGRAMS,
732 !! 640 is_udplite);
733 return -ret; 641 return -ret;
734 } 642 }
735 } 643 }
736 644
737 /* FALLTHROUGH -- it's a UDP P 645 /* FALLTHROUGH -- it's a UDP Packet */
738 } 646 }
739 647
740 /* 648 /*
741 * UDP-Lite specific tests, ignored on 649 * UDP-Lite specific tests, ignored on UDP sockets (see net/ipv4/udp.c).
742 */ 650 */
743 if (udp_test_bit(UDPLITE_RECV_CC, sk) !! 651 if ((up->pcflag & UDPLITE_RECV_CC) && UDP_SKB_CB(skb)->partial_cov) {
744 u16 pcrlen = READ_ONCE(up->pcr <<
745 652
746 if (pcrlen == 0) { /* !! 653 if (up->pcrlen == 0) { /* full coverage was set */
747 net_dbg_ratelimited("U 654 net_dbg_ratelimited("UDPLITE6: partial coverage %d while full coverage %d requested\n",
748 UD 655 UDP_SKB_CB(skb)->cscov, skb->len);
749 goto drop; 656 goto drop;
750 } 657 }
751 if (UDP_SKB_CB(skb)->cscov < p !! 658 if (UDP_SKB_CB(skb)->cscov < up->pcrlen) {
752 net_dbg_ratelimited("U 659 net_dbg_ratelimited("UDPLITE6: coverage %d too small, need min %d\n",
753 UD !! 660 UDP_SKB_CB(skb)->cscov, up->pcrlen);
754 goto drop; 661 goto drop;
755 } 662 }
756 } 663 }
757 664
758 prefetch(&sk->sk_rmem_alloc); 665 prefetch(&sk->sk_rmem_alloc);
759 if (rcu_access_pointer(sk->sk_filter) 666 if (rcu_access_pointer(sk->sk_filter) &&
760 udp_lib_checksum_complete(skb)) 667 udp_lib_checksum_complete(skb))
761 goto csum_error; 668 goto csum_error;
762 669
763 if (sk_filter_trim_cap(sk, skb, sizeof !! 670 if (sk_filter_trim_cap(sk, skb, sizeof(struct udphdr)))
764 drop_reason = SKB_DROP_REASON_ <<
765 goto drop; 671 goto drop;
766 } <<
767 672
768 udp_csum_pull_header(skb); 673 udp_csum_pull_header(skb);
769 674
770 skb_dst_drop(skb); 675 skb_dst_drop(skb);
771 676
772 return __udpv6_queue_rcv_skb(sk, skb); 677 return __udpv6_queue_rcv_skb(sk, skb);
773 678
774 csum_error: 679 csum_error:
775 drop_reason = SKB_DROP_REASON_UDP_CSUM <<
776 __UDP6_INC_STATS(sock_net(sk), UDP_MIB 680 __UDP6_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
777 drop: 681 drop:
778 __UDP6_INC_STATS(sock_net(sk), UDP_MIB 682 __UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
779 atomic_inc(&sk->sk_drops); 683 atomic_inc(&sk->sk_drops);
780 sk_skb_reason_drop(sk, skb, drop_reaso !! 684 kfree_skb(skb);
781 return -1; 685 return -1;
782 } 686 }
783 687
784 static int udpv6_queue_rcv_skb(struct sock *sk 688 static int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
785 { 689 {
786 struct sk_buff *next, *segs; 690 struct sk_buff *next, *segs;
787 int ret; 691 int ret;
788 692
789 if (likely(!udp_unexpected_gso(sk, skb 693 if (likely(!udp_unexpected_gso(sk, skb)))
790 return udpv6_queue_rcv_one_skb 694 return udpv6_queue_rcv_one_skb(sk, skb);
791 695
792 __skb_push(skb, -skb_mac_offset(skb)); 696 __skb_push(skb, -skb_mac_offset(skb));
793 segs = udp_rcv_segment(sk, skb, false) 697 segs = udp_rcv_segment(sk, skb, false);
794 skb_list_walk_safe(segs, skb, next) { 698 skb_list_walk_safe(segs, skb, next) {
795 __skb_pull(skb, skb_transport_ 699 __skb_pull(skb, skb_transport_offset(skb));
796 700
797 udp_post_segment_fix_csum(skb) <<
798 ret = udpv6_queue_rcv_one_skb( 701 ret = udpv6_queue_rcv_one_skb(sk, skb);
799 if (ret > 0) 702 if (ret > 0)
800 ip6_protocol_deliver_r 703 ip6_protocol_deliver_rcu(dev_net(skb->dev), skb, ret,
801 704 true);
802 } 705 }
803 return 0; 706 return 0;
804 } 707 }
805 708
806 static bool __udp_v6_is_mcast_sock(struct net !! 709 static bool __udp_v6_is_mcast_sock(struct net *net, struct sock *sk,
807 __be16 loc_ 710 __be16 loc_port, const struct in6_addr *loc_addr,
808 __be16 rmt_ 711 __be16 rmt_port, const struct in6_addr *rmt_addr,
809 int dif, in 712 int dif, int sdif, unsigned short hnum)
810 { 713 {
811 const struct inet_sock *inet = inet_sk !! 714 struct inet_sock *inet = inet_sk(sk);
812 715
813 if (!net_eq(sock_net(sk), net)) 716 if (!net_eq(sock_net(sk), net))
814 return false; 717 return false;
815 718
816 if (udp_sk(sk)->udp_port_hash != hnum 719 if (udp_sk(sk)->udp_port_hash != hnum ||
817 sk->sk_family != PF_INET6 || 720 sk->sk_family != PF_INET6 ||
818 (inet->inet_dport && inet->inet_dp 721 (inet->inet_dport && inet->inet_dport != rmt_port) ||
819 (!ipv6_addr_any(&sk->sk_v6_daddr) 722 (!ipv6_addr_any(&sk->sk_v6_daddr) &&
820 !ipv6_addr_equal(&sk->sk_v 723 !ipv6_addr_equal(&sk->sk_v6_daddr, rmt_addr)) ||
821 !udp_sk_bound_dev_eq(net, READ_ONC !! 724 !udp_sk_bound_dev_eq(net, sk->sk_bound_dev_if, dif, sdif) ||
822 (!ipv6_addr_any(&sk->sk_v6_rcv_sad 725 (!ipv6_addr_any(&sk->sk_v6_rcv_saddr) &&
823 !ipv6_addr_equal(&sk->sk_v 726 !ipv6_addr_equal(&sk->sk_v6_rcv_saddr, loc_addr)))
824 return false; 727 return false;
825 if (!inet6_mc_check(sk, loc_addr, rmt_ 728 if (!inet6_mc_check(sk, loc_addr, rmt_addr))
826 return false; 729 return false;
827 return true; 730 return true;
828 } 731 }
829 732
830 static void udp6_csum_zero_error(struct sk_buf 733 static void udp6_csum_zero_error(struct sk_buff *skb)
831 { 734 {
832 /* RFC 2460 section 8.1 says that we S 735 /* RFC 2460 section 8.1 says that we SHOULD log
833 * this error. Well, it is reasonable. 736 * this error. Well, it is reasonable.
834 */ 737 */
835 net_dbg_ratelimited("IPv6: udp checksu 738 net_dbg_ratelimited("IPv6: udp checksum is 0 for [%pI6c]:%u->[%pI6c]:%u\n",
836 &ipv6_hdr(skb)->sa 739 &ipv6_hdr(skb)->saddr, ntohs(udp_hdr(skb)->source),
837 &ipv6_hdr(skb)->da 740 &ipv6_hdr(skb)->daddr, ntohs(udp_hdr(skb)->dest));
838 } 741 }
839 742
840 /* 743 /*
841 * Note: called only from the BH handler conte 744 * Note: called only from the BH handler context,
842 * so we don't need to lock the hashes. 745 * so we don't need to lock the hashes.
843 */ 746 */
844 static int __udp6_lib_mcast_deliver(struct net 747 static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
845 const struct in6_addr *saddr, 748 const struct in6_addr *saddr, const struct in6_addr *daddr,
846 struct udp_table *udptable, in 749 struct udp_table *udptable, int proto)
847 { 750 {
848 struct sock *sk, *first = NULL; 751 struct sock *sk, *first = NULL;
849 const struct udphdr *uh = udp_hdr(skb) 752 const struct udphdr *uh = udp_hdr(skb);
850 unsigned short hnum = ntohs(uh->dest); 753 unsigned short hnum = ntohs(uh->dest);
851 struct udp_hslot *hslot = udp_hashslot 754 struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
852 unsigned int offset = offsetof(typeof( 755 unsigned int offset = offsetof(typeof(*sk), sk_node);
853 unsigned int hash2 = 0, hash2_any = 0, 756 unsigned int hash2 = 0, hash2_any = 0, use_hash2 = (hslot->count > 10);
854 int dif = inet6_iif(skb); 757 int dif = inet6_iif(skb);
855 int sdif = inet6_sdif(skb); 758 int sdif = inet6_sdif(skb);
856 struct hlist_node *node; 759 struct hlist_node *node;
857 struct sk_buff *nskb; 760 struct sk_buff *nskb;
858 761
859 if (use_hash2) { 762 if (use_hash2) {
860 hash2_any = ipv6_portaddr_hash 763 hash2_any = ipv6_portaddr_hash(net, &in6addr_any, hnum) &
861 udptable->mask; 764 udptable->mask;
862 hash2 = ipv6_portaddr_hash(net 765 hash2 = ipv6_portaddr_hash(net, daddr, hnum) & udptable->mask;
863 start_lookup: 766 start_lookup:
864 hslot = &udptable->hash2[hash2 767 hslot = &udptable->hash2[hash2];
865 offset = offsetof(typeof(*sk), 768 offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);
866 } 769 }
867 770
868 sk_for_each_entry_offset_rcu(sk, node, 771 sk_for_each_entry_offset_rcu(sk, node, &hslot->head, offset) {
869 if (!__udp_v6_is_mcast_sock(ne 772 if (!__udp_v6_is_mcast_sock(net, sk, uh->dest, daddr,
870 uh 773 uh->source, saddr, dif, sdif,
871 hn 774 hnum))
872 continue; 775 continue;
873 /* If zero checksum and no_che 776 /* If zero checksum and no_check is not on for
874 * the socket then skip it. 777 * the socket then skip it.
875 */ 778 */
876 if (!uh->check && !udp_get_no_ !! 779 if (!uh->check && !udp_sk(sk)->no_check6_rx)
877 continue; 780 continue;
878 if (!first) { 781 if (!first) {
879 first = sk; 782 first = sk;
880 continue; 783 continue;
881 } 784 }
882 nskb = skb_clone(skb, GFP_ATOM 785 nskb = skb_clone(skb, GFP_ATOMIC);
883 if (unlikely(!nskb)) { 786 if (unlikely(!nskb)) {
884 atomic_inc(&sk->sk_dro 787 atomic_inc(&sk->sk_drops);
885 __UDP6_INC_STATS(net, 788 __UDP6_INC_STATS(net, UDP_MIB_RCVBUFERRORS,
886 IS_UD 789 IS_UDPLITE(sk));
887 __UDP6_INC_STATS(net, 790 __UDP6_INC_STATS(net, UDP_MIB_INERRORS,
888 IS_UD 791 IS_UDPLITE(sk));
889 continue; 792 continue;
890 } 793 }
891 794
892 if (udpv6_queue_rcv_skb(sk, ns 795 if (udpv6_queue_rcv_skb(sk, nskb) > 0)
893 consume_skb(nskb); 796 consume_skb(nskb);
894 } 797 }
895 798
896 /* Also lookup *:port if we are using 799 /* Also lookup *:port if we are using hash2 and haven't done so yet. */
897 if (use_hash2 && hash2 != hash2_any) { 800 if (use_hash2 && hash2 != hash2_any) {
898 hash2 = hash2_any; 801 hash2 = hash2_any;
899 goto start_lookup; 802 goto start_lookup;
900 } 803 }
901 804
902 if (first) { 805 if (first) {
903 if (udpv6_queue_rcv_skb(first, 806 if (udpv6_queue_rcv_skb(first, skb) > 0)
904 consume_skb(skb); 807 consume_skb(skb);
905 } else { 808 } else {
906 kfree_skb(skb); 809 kfree_skb(skb);
907 __UDP6_INC_STATS(net, UDP_MIB_ 810 __UDP6_INC_STATS(net, UDP_MIB_IGNOREDMULTI,
908 proto == IPPR 811 proto == IPPROTO_UDPLITE);
909 } 812 }
910 return 0; 813 return 0;
911 } 814 }
912 815
913 static void udp6_sk_rx_dst_set(struct sock *sk 816 static void udp6_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst)
914 { 817 {
915 if (udp_sk_rx_dst_set(sk, dst)) !! 818 if (udp_sk_rx_dst_set(sk, dst)) {
916 sk->sk_rx_dst_cookie = rt6_get !! 819 const struct rt6_info *rt = (const struct rt6_info *)dst;
>> 820
>> 821 inet6_sk(sk)->rx_dst_cookie = rt6_get_cookie(rt);
>> 822 }
917 } 823 }
918 824
919 /* wrapper for udp_queue_rcv_skb tacking care 825 /* wrapper for udp_queue_rcv_skb tacking care of csum conversion and
920 * return code conversion for ip layer consump 826 * return code conversion for ip layer consumption
921 */ 827 */
922 static int udp6_unicast_rcv_skb(struct sock *s 828 static int udp6_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,
923 struct udphdr 829 struct udphdr *uh)
924 { 830 {
925 int ret; 831 int ret;
926 832
927 if (inet_get_convert_csum(sk) && uh->c 833 if (inet_get_convert_csum(sk) && uh->check && !IS_UDPLITE(sk))
928 skb_checksum_try_convert(skb, 834 skb_checksum_try_convert(skb, IPPROTO_UDP, ip6_compute_pseudo);
929 835
930 ret = udpv6_queue_rcv_skb(sk, skb); 836 ret = udpv6_queue_rcv_skb(sk, skb);
931 837
932 /* a return value > 0 means to resubmi 838 /* a return value > 0 means to resubmit the input */
933 if (ret > 0) 839 if (ret > 0)
934 return ret; 840 return ret;
935 return 0; 841 return 0;
936 } 842 }
937 843
938 int __udp6_lib_rcv(struct sk_buff *skb, struct 844 int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
939 int proto) 845 int proto)
940 { 846 {
941 enum skb_drop_reason reason = SKB_DROP <<
942 const struct in6_addr *saddr, *daddr; 847 const struct in6_addr *saddr, *daddr;
943 struct net *net = dev_net(skb->dev); 848 struct net *net = dev_net(skb->dev);
944 struct sock *sk = NULL; <<
945 struct udphdr *uh; 849 struct udphdr *uh;
>> 850 struct sock *sk;
946 bool refcounted; 851 bool refcounted;
947 u32 ulen = 0; 852 u32 ulen = 0;
948 853
949 if (!pskb_may_pull(skb, sizeof(struct 854 if (!pskb_may_pull(skb, sizeof(struct udphdr)))
950 goto discard; 855 goto discard;
951 856
952 saddr = &ipv6_hdr(skb)->saddr; 857 saddr = &ipv6_hdr(skb)->saddr;
953 daddr = &ipv6_hdr(skb)->daddr; 858 daddr = &ipv6_hdr(skb)->daddr;
954 uh = udp_hdr(skb); 859 uh = udp_hdr(skb);
955 860
956 ulen = ntohs(uh->len); 861 ulen = ntohs(uh->len);
957 if (ulen > skb->len) 862 if (ulen > skb->len)
958 goto short_packet; 863 goto short_packet;
959 864
960 if (proto == IPPROTO_UDP) { 865 if (proto == IPPROTO_UDP) {
961 /* UDP validates ulen. */ 866 /* UDP validates ulen. */
962 867
963 /* Check for jumbo payload */ 868 /* Check for jumbo payload */
964 if (ulen == 0) 869 if (ulen == 0)
965 ulen = skb->len; 870 ulen = skb->len;
966 871
967 if (ulen < sizeof(*uh)) 872 if (ulen < sizeof(*uh))
968 goto short_packet; 873 goto short_packet;
969 874
970 if (ulen < skb->len) { 875 if (ulen < skb->len) {
971 if (pskb_trim_rcsum(sk 876 if (pskb_trim_rcsum(skb, ulen))
972 goto short_pac 877 goto short_packet;
973 saddr = &ipv6_hdr(skb) 878 saddr = &ipv6_hdr(skb)->saddr;
974 daddr = &ipv6_hdr(skb) 879 daddr = &ipv6_hdr(skb)->daddr;
975 uh = udp_hdr(skb); 880 uh = udp_hdr(skb);
976 } 881 }
977 } 882 }
978 883
979 if (udp6_csum_init(skb, uh, proto)) 884 if (udp6_csum_init(skb, uh, proto))
980 goto csum_error; 885 goto csum_error;
981 886
982 /* Check if the socket is already avai 887 /* Check if the socket is already available, e.g. due to early demux */
983 sk = inet6_steal_sock(net, skb, sizeof !! 888 sk = skb_steal_sock(skb, &refcounted);
984 &refcounted, udp <<
985 if (IS_ERR(sk)) <<
986 goto no_sk; <<
987 <<
988 if (sk) { 889 if (sk) {
989 struct dst_entry *dst = skb_ds 890 struct dst_entry *dst = skb_dst(skb);
990 int ret; 891 int ret;
991 892
992 if (unlikely(rcu_dereference(s !! 893 if (unlikely(sk->sk_rx_dst != dst))
993 udp6_sk_rx_dst_set(sk, 894 udp6_sk_rx_dst_set(sk, dst);
994 895
995 if (!uh->check && !udp_get_no_ !! 896 if (!uh->check && !udp_sk(sk)->no_check6_rx) {
996 if (refcounted) 897 if (refcounted)
997 sock_put(sk); 898 sock_put(sk);
998 goto report_csum_error 899 goto report_csum_error;
999 } 900 }
1000 901
1001 ret = udp6_unicast_rcv_skb(sk 902 ret = udp6_unicast_rcv_skb(sk, skb, uh);
1002 if (refcounted) 903 if (refcounted)
1003 sock_put(sk); 904 sock_put(sk);
1004 return ret; 905 return ret;
1005 } 906 }
1006 907
1007 /* 908 /*
1008 * Multicast receive code 909 * Multicast receive code
1009 */ 910 */
1010 if (ipv6_addr_is_multicast(daddr)) 911 if (ipv6_addr_is_multicast(daddr))
1011 return __udp6_lib_mcast_deliv 912 return __udp6_lib_mcast_deliver(net, skb,
1012 saddr, daddr, 913 saddr, daddr, udptable, proto);
1013 914
1014 /* Unicast */ 915 /* Unicast */
1015 sk = __udp6_lib_lookup_skb(skb, uh->s 916 sk = __udp6_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
1016 if (sk) { 917 if (sk) {
1017 if (!uh->check && !udp_get_no !! 918 if (!uh->check && !udp_sk(sk)->no_check6_rx)
1018 goto report_csum_erro 919 goto report_csum_error;
1019 return udp6_unicast_rcv_skb(s 920 return udp6_unicast_rcv_skb(sk, skb, uh);
1020 } 921 }
1021 no_sk: <<
1022 reason = SKB_DROP_REASON_NO_SOCKET; <<
1023 922
1024 if (!uh->check) 923 if (!uh->check)
1025 goto report_csum_error; 924 goto report_csum_error;
1026 925
1027 if (!xfrm6_policy_check(NULL, XFRM_PO 926 if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
1028 goto discard; 927 goto discard;
1029 nf_reset_ct(skb); <<
1030 928
1031 if (udp_lib_checksum_complete(skb)) 929 if (udp_lib_checksum_complete(skb))
1032 goto csum_error; 930 goto csum_error;
1033 931
1034 __UDP6_INC_STATS(net, UDP_MIB_NOPORTS 932 __UDP6_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
1035 icmpv6_send(skb, ICMPV6_DEST_UNREACH, 933 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
1036 934
1037 sk_skb_reason_drop(sk, skb, reason); !! 935 kfree_skb(skb);
1038 return 0; 936 return 0;
1039 937
1040 short_packet: 938 short_packet:
1041 if (reason == SKB_DROP_REASON_NOT_SPE <<
1042 reason = SKB_DROP_REASON_PKT_ <<
1043 net_dbg_ratelimited("UDP%sv6: short p 939 net_dbg_ratelimited("UDP%sv6: short packet: From [%pI6c]:%u %d/%d to [%pI6c]:%u\n",
1044 proto == IPPROTO_ 940 proto == IPPROTO_UDPLITE ? "-Lite" : "",
1045 saddr, ntohs(uh-> 941 saddr, ntohs(uh->source),
1046 ulen, skb->len, 942 ulen, skb->len,
1047 daddr, ntohs(uh-> 943 daddr, ntohs(uh->dest));
1048 goto discard; 944 goto discard;
1049 945
1050 report_csum_error: 946 report_csum_error:
1051 udp6_csum_zero_error(skb); 947 udp6_csum_zero_error(skb);
1052 csum_error: 948 csum_error:
1053 if (reason == SKB_DROP_REASON_NOT_SPE <<
1054 reason = SKB_DROP_REASON_UDP_ <<
1055 __UDP6_INC_STATS(net, UDP_MIB_CSUMERR 949 __UDP6_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);
1056 discard: 950 discard:
1057 __UDP6_INC_STATS(net, UDP_MIB_INERROR 951 __UDP6_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);
1058 sk_skb_reason_drop(sk, skb, reason); !! 952 kfree_skb(skb);
1059 return 0; 953 return 0;
1060 } 954 }
1061 955
1062 956
1063 static struct sock *__udp6_lib_demux_lookup(s 957 static struct sock *__udp6_lib_demux_lookup(struct net *net,
1064 __be16 loc_port, cons 958 __be16 loc_port, const struct in6_addr *loc_addr,
1065 __be16 rmt_port, cons 959 __be16 rmt_port, const struct in6_addr *rmt_addr,
1066 int dif, int sdif) 960 int dif, int sdif)
1067 { 961 {
1068 struct udp_table *udptable = net->ipv <<
1069 unsigned short hnum = ntohs(loc_port) 962 unsigned short hnum = ntohs(loc_port);
1070 unsigned int hash2, slot2; !! 963 unsigned int hash2 = ipv6_portaddr_hash(net, loc_addr, hnum);
1071 struct udp_hslot *hslot2; !! 964 unsigned int slot2 = hash2 & udp_table.mask;
1072 __portpair ports; !! 965 struct udp_hslot *hslot2 = &udp_table.hash2[slot2];
>> 966 const __portpair ports = INET_COMBINED_PORTS(rmt_port, hnum);
1073 struct sock *sk; 967 struct sock *sk;
1074 968
1075 hash2 = ipv6_portaddr_hash(net, loc_a <<
1076 slot2 = hash2 & udptable->mask; <<
1077 hslot2 = &udptable->hash2[slot2]; <<
1078 ports = INET_COMBINED_PORTS(rmt_port, <<
1079 <<
1080 udp_portaddr_for_each_entry_rcu(sk, & 969 udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) {
1081 if (sk->sk_state == TCP_ESTAB 970 if (sk->sk_state == TCP_ESTABLISHED &&
1082 inet6_match(net, sk, rmt_ !! 971 INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif, sdif))
1083 return sk; 972 return sk;
1084 /* Only check first socket in 973 /* Only check first socket in chain */
1085 break; 974 break;
1086 } 975 }
1087 return NULL; 976 return NULL;
1088 } 977 }
1089 978
1090 void udp_v6_early_demux(struct sk_buff *skb) !! 979 INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb)
1091 { 980 {
1092 struct net *net = dev_net(skb->dev); 981 struct net *net = dev_net(skb->dev);
1093 const struct udphdr *uh; 982 const struct udphdr *uh;
1094 struct sock *sk; 983 struct sock *sk;
1095 struct dst_entry *dst; 984 struct dst_entry *dst;
1096 int dif = skb->dev->ifindex; 985 int dif = skb->dev->ifindex;
1097 int sdif = inet6_sdif(skb); 986 int sdif = inet6_sdif(skb);
1098 987
1099 if (!pskb_may_pull(skb, skb_transport 988 if (!pskb_may_pull(skb, skb_transport_offset(skb) +
1100 sizeof(struct udphdr))) 989 sizeof(struct udphdr)))
1101 return; 990 return;
1102 991
1103 uh = udp_hdr(skb); 992 uh = udp_hdr(skb);
1104 993
1105 if (skb->pkt_type == PACKET_HOST) 994 if (skb->pkt_type == PACKET_HOST)
1106 sk = __udp6_lib_demux_lookup( 995 sk = __udp6_lib_demux_lookup(net, uh->dest,
1107 996 &ipv6_hdr(skb)->daddr,
1108 997 uh->source, &ipv6_hdr(skb)->saddr,
1109 998 dif, sdif);
1110 else 999 else
1111 return; 1000 return;
1112 1001
1113 if (!sk) !! 1002 if (!sk || !refcount_inc_not_zero(&sk->sk_refcnt))
1114 return; 1003 return;
1115 1004
1116 skb->sk = sk; 1005 skb->sk = sk;
1117 DEBUG_NET_WARN_ON_ONCE(sk_is_refcount !! 1006 skb->destructor = sock_efree;
1118 skb->destructor = sock_pfree; !! 1007 dst = READ_ONCE(sk->sk_rx_dst);
1119 dst = rcu_dereference(sk->sk_rx_dst); <<
1120 1008
1121 if (dst) 1009 if (dst)
1122 dst = dst_check(dst, sk->sk_r !! 1010 dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
1123 if (dst) { 1011 if (dst) {
1124 /* set noref for now. 1012 /* set noref for now.
1125 * any place which wants to h 1013 * any place which wants to hold dst has to call
1126 * dst_hold_safe() 1014 * dst_hold_safe()
1127 */ 1015 */
1128 skb_dst_set_noref(skb, dst); 1016 skb_dst_set_noref(skb, dst);
1129 } 1017 }
1130 } 1018 }
1131 1019
1132 INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct 1020 INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb)
1133 { 1021 {
1134 return __udp6_lib_rcv(skb, dev_net(sk !! 1022 return __udp6_lib_rcv(skb, &udp_table, IPPROTO_UDP);
1135 } 1023 }
1136 1024
1137 /* 1025 /*
1138 * Throw away all pending data and cancel the 1026 * Throw away all pending data and cancel the corking. Socket is locked.
1139 */ 1027 */
1140 static void udp_v6_flush_pending_frames(struc 1028 static void udp_v6_flush_pending_frames(struct sock *sk)
1141 { 1029 {
1142 struct udp_sock *up = udp_sk(sk); 1030 struct udp_sock *up = udp_sk(sk);
1143 1031
1144 if (up->pending == AF_INET) 1032 if (up->pending == AF_INET)
1145 udp_flush_pending_frames(sk); 1033 udp_flush_pending_frames(sk);
1146 else if (up->pending) { 1034 else if (up->pending) {
1147 up->len = 0; 1035 up->len = 0;
1148 WRITE_ONCE(up->pending, 0); !! 1036 up->pending = 0;
1149 ip6_flush_pending_frames(sk); 1037 ip6_flush_pending_frames(sk);
1150 } 1038 }
1151 } 1039 }
1152 1040
1153 static int udpv6_pre_connect(struct sock *sk, 1041 static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,
1154 int addr_len) 1042 int addr_len)
1155 { 1043 {
1156 if (addr_len < offsetofend(struct soc 1044 if (addr_len < offsetofend(struct sockaddr, sa_family))
1157 return -EINVAL; 1045 return -EINVAL;
1158 /* The following checks are replicate 1046 /* The following checks are replicated from __ip6_datagram_connect()
1159 * and intended to prevent BPF progra 1047 * and intended to prevent BPF program called below from accessing
1160 * bytes that are out of the bound sp 1048 * bytes that are out of the bound specified by user in addr_len.
1161 */ 1049 */
1162 if (uaddr->sa_family == AF_INET) { 1050 if (uaddr->sa_family == AF_INET) {
1163 if (ipv6_only_sock(sk)) !! 1051 if (__ipv6_only_sock(sk))
1164 return -EAFNOSUPPORT; 1052 return -EAFNOSUPPORT;
1165 return udp_pre_connect(sk, ua 1053 return udp_pre_connect(sk, uaddr, addr_len);
1166 } 1054 }
1167 1055
1168 if (addr_len < SIN6_LEN_RFC2133) 1056 if (addr_len < SIN6_LEN_RFC2133)
1169 return -EINVAL; 1057 return -EINVAL;
1170 1058
1171 return BPF_CGROUP_RUN_PROG_INET6_CONN !! 1059 return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr);
1172 } 1060 }
1173 1061
1174 /** 1062 /**
1175 * udp6_hwcsum_outgoing - handle outgo 1063 * udp6_hwcsum_outgoing - handle outgoing HW checksumming
1176 * @sk: socket we are sending on 1064 * @sk: socket we are sending on
1177 * @skb: sk_buff containing the filled 1065 * @skb: sk_buff containing the filled-in UDP header
1178 * (checksum field must be zeroe 1066 * (checksum field must be zeroed out)
1179 * @saddr: source address <<
1180 * @daddr: destination address <<
1181 * @len: length of packet <<
1182 */ 1067 */
1183 static void udp6_hwcsum_outgoing(struct sock 1068 static void udp6_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
1184 const struct 1069 const struct in6_addr *saddr,
1185 const struct 1070 const struct in6_addr *daddr, int len)
1186 { 1071 {
1187 unsigned int offset; 1072 unsigned int offset;
1188 struct udphdr *uh = udp_hdr(skb); 1073 struct udphdr *uh = udp_hdr(skb);
1189 struct sk_buff *frags = skb_shinfo(sk 1074 struct sk_buff *frags = skb_shinfo(skb)->frag_list;
1190 __wsum csum = 0; 1075 __wsum csum = 0;
1191 1076
1192 if (!frags) { 1077 if (!frags) {
1193 /* Only one fragment on the s 1078 /* Only one fragment on the socket. */
1194 skb->csum_start = skb_transpo 1079 skb->csum_start = skb_transport_header(skb) - skb->head;
1195 skb->csum_offset = offsetof(s 1080 skb->csum_offset = offsetof(struct udphdr, check);
1196 uh->check = ~csum_ipv6_magic( 1081 uh->check = ~csum_ipv6_magic(saddr, daddr, len, IPPROTO_UDP, 0);
1197 } else { 1082 } else {
1198 /* 1083 /*
1199 * HW-checksum won't work as 1084 * HW-checksum won't work as there are two or more
1200 * fragments on the socket so 1085 * fragments on the socket so that all csums of sk_buffs
1201 * should be together 1086 * should be together
1202 */ 1087 */
1203 offset = skb_transport_offset 1088 offset = skb_transport_offset(skb);
1204 skb->csum = skb_checksum(skb, 1089 skb->csum = skb_checksum(skb, offset, skb->len - offset, 0);
1205 csum = skb->csum; 1090 csum = skb->csum;
1206 1091
1207 skb->ip_summed = CHECKSUM_NON 1092 skb->ip_summed = CHECKSUM_NONE;
1208 1093
1209 do { 1094 do {
1210 csum = csum_add(csum, 1095 csum = csum_add(csum, frags->csum);
1211 } while ((frags = frags->next 1096 } while ((frags = frags->next));
1212 1097
1213 uh->check = csum_ipv6_magic(s 1098 uh->check = csum_ipv6_magic(saddr, daddr, len, IPPROTO_UDP,
1214 c 1099 csum);
1215 if (uh->check == 0) 1100 if (uh->check == 0)
1216 uh->check = CSUM_MANG 1101 uh->check = CSUM_MANGLED_0;
1217 } 1102 }
1218 } 1103 }
1219 1104
1220 /* 1105 /*
1221 * Sending 1106 * Sending
1222 */ 1107 */
1223 1108
1224 static int udp_v6_send_skb(struct sk_buff *sk 1109 static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
1225 struct inet_cork * 1110 struct inet_cork *cork)
1226 { 1111 {
1227 struct sock *sk = skb->sk; 1112 struct sock *sk = skb->sk;
1228 struct udphdr *uh; 1113 struct udphdr *uh;
1229 int err = 0; 1114 int err = 0;
1230 int is_udplite = IS_UDPLITE(sk); 1115 int is_udplite = IS_UDPLITE(sk);
1231 __wsum csum = 0; 1116 __wsum csum = 0;
1232 int offset = skb_transport_offset(skb 1117 int offset = skb_transport_offset(skb);
1233 int len = skb->len - offset; 1118 int len = skb->len - offset;
1234 int datalen = len - sizeof(*uh); 1119 int datalen = len - sizeof(*uh);
1235 1120
1236 /* 1121 /*
1237 * Create a UDP header 1122 * Create a UDP header
1238 */ 1123 */
1239 uh = udp_hdr(skb); 1124 uh = udp_hdr(skb);
1240 uh->source = fl6->fl6_sport; 1125 uh->source = fl6->fl6_sport;
1241 uh->dest = fl6->fl6_dport; 1126 uh->dest = fl6->fl6_dport;
1242 uh->len = htons(len); 1127 uh->len = htons(len);
1243 uh->check = 0; 1128 uh->check = 0;
1244 1129
1245 if (cork->gso_size) { 1130 if (cork->gso_size) {
1246 const int hlen = skb_network_ 1131 const int hlen = skb_network_header_len(skb) +
1247 sizeof(struc 1132 sizeof(struct udphdr);
1248 1133
1249 if (hlen + cork->gso_size > c 1134 if (hlen + cork->gso_size > cork->fragsize) {
1250 kfree_skb(skb); 1135 kfree_skb(skb);
1251 return -EINVAL; 1136 return -EINVAL;
1252 } 1137 }
1253 if (datalen > cork->gso_size !! 1138 if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS) {
1254 kfree_skb(skb); 1139 kfree_skb(skb);
1255 return -EINVAL; 1140 return -EINVAL;
1256 } 1141 }
1257 if (udp_get_no_check6_tx(sk)) !! 1142 if (udp_sk(sk)->no_check6_tx) {
1258 kfree_skb(skb); 1143 kfree_skb(skb);
1259 return -EINVAL; 1144 return -EINVAL;
1260 } 1145 }
1261 if (is_udplite || dst_xfrm(sk !! 1146 if (skb->ip_summed != CHECKSUM_PARTIAL || is_udplite ||
>> 1147 dst_xfrm(skb_dst(skb))) {
1262 kfree_skb(skb); 1148 kfree_skb(skb);
1263 return -EIO; 1149 return -EIO;
1264 } 1150 }
1265 1151
1266 if (datalen > cork->gso_size) 1152 if (datalen > cork->gso_size) {
1267 skb_shinfo(skb)->gso_ 1153 skb_shinfo(skb)->gso_size = cork->gso_size;
1268 skb_shinfo(skb)->gso_ 1154 skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
1269 skb_shinfo(skb)->gso_ 1155 skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(datalen,
1270 1156 cork->gso_size);
1271 <<
1272 /* Don't checksum the <<
1273 goto csum_partial; <<
1274 } 1157 }
>> 1158 goto csum_partial;
1275 } 1159 }
1276 1160
1277 if (is_udplite) 1161 if (is_udplite)
1278 csum = udplite_csum(skb); 1162 csum = udplite_csum(skb);
1279 else if (udp_get_no_check6_tx(sk)) { !! 1163 else if (udp_sk(sk)->no_check6_tx) { /* UDP csum disabled */
1280 skb->ip_summed = CHECKSUM_NON 1164 skb->ip_summed = CHECKSUM_NONE;
1281 goto send; 1165 goto send;
1282 } else if (skb->ip_summed == CHECKSUM 1166 } else if (skb->ip_summed == CHECKSUM_PARTIAL) { /* UDP hardware csum */
1283 csum_partial: 1167 csum_partial:
1284 udp6_hwcsum_outgoing(sk, skb, 1168 udp6_hwcsum_outgoing(sk, skb, &fl6->saddr, &fl6->daddr, len);
1285 goto send; 1169 goto send;
1286 } else 1170 } else
1287 csum = udp_csum(skb); 1171 csum = udp_csum(skb);
1288 1172
1289 /* add protocol-dependent pseudo-head 1173 /* add protocol-dependent pseudo-header */
1290 uh->check = csum_ipv6_magic(&fl6->sad 1174 uh->check = csum_ipv6_magic(&fl6->saddr, &fl6->daddr,
1291 len, fl6- 1175 len, fl6->flowi6_proto, csum);
1292 if (uh->check == 0) 1176 if (uh->check == 0)
1293 uh->check = CSUM_MANGLED_0; 1177 uh->check = CSUM_MANGLED_0;
1294 1178
1295 send: 1179 send:
1296 err = ip6_send_skb(skb); 1180 err = ip6_send_skb(skb);
1297 if (err) { 1181 if (err) {
1298 if (err == -ENOBUFS && !inet6 !! 1182 if (err == -ENOBUFS && !inet6_sk(sk)->recverr) {
1299 UDP6_INC_STATS(sock_n 1183 UDP6_INC_STATS(sock_net(sk),
1300 UDP_MI 1184 UDP_MIB_SNDBUFERRORS, is_udplite);
1301 err = 0; 1185 err = 0;
1302 } 1186 }
1303 } else { 1187 } else {
1304 UDP6_INC_STATS(sock_net(sk), 1188 UDP6_INC_STATS(sock_net(sk),
1305 UDP_MIB_OUTDAT 1189 UDP_MIB_OUTDATAGRAMS, is_udplite);
1306 } 1190 }
1307 return err; 1191 return err;
1308 } 1192 }
1309 1193
1310 static int udp_v6_push_pending_frames(struct 1194 static int udp_v6_push_pending_frames(struct sock *sk)
1311 { 1195 {
1312 struct sk_buff *skb; 1196 struct sk_buff *skb;
1313 struct udp_sock *up = udp_sk(sk); 1197 struct udp_sock *up = udp_sk(sk);
>> 1198 struct flowi6 fl6;
1314 int err = 0; 1199 int err = 0;
1315 1200
1316 if (up->pending == AF_INET) 1201 if (up->pending == AF_INET)
1317 return udp_push_pending_frame 1202 return udp_push_pending_frames(sk);
1318 1203
>> 1204 /* ip6_finish_skb will release the cork, so make a copy of
>> 1205 * fl6 here.
>> 1206 */
>> 1207 fl6 = inet_sk(sk)->cork.fl.u.ip6;
>> 1208
1319 skb = ip6_finish_skb(sk); 1209 skb = ip6_finish_skb(sk);
1320 if (!skb) 1210 if (!skb)
1321 goto out; 1211 goto out;
1322 1212
1323 err = udp_v6_send_skb(skb, &inet_sk(s !! 1213 err = udp_v6_send_skb(skb, &fl6, &inet_sk(sk)->cork.base);
1324 &inet_sk(sk)->c !! 1214
1325 out: 1215 out:
1326 up->len = 0; 1216 up->len = 0;
1327 WRITE_ONCE(up->pending, 0); !! 1217 up->pending = 0;
1328 return err; 1218 return err;
1329 } 1219 }
1330 1220
1331 int udpv6_sendmsg(struct sock *sk, struct msg 1221 int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
1332 { 1222 {
1333 struct ipv6_txoptions opt_space; 1223 struct ipv6_txoptions opt_space;
1334 struct udp_sock *up = udp_sk(sk); 1224 struct udp_sock *up = udp_sk(sk);
1335 struct inet_sock *inet = inet_sk(sk); 1225 struct inet_sock *inet = inet_sk(sk);
1336 struct ipv6_pinfo *np = inet6_sk(sk); 1226 struct ipv6_pinfo *np = inet6_sk(sk);
1337 DECLARE_SOCKADDR(struct sockaddr_in6 1227 DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name);
1338 struct in6_addr *daddr, *final_p, fin 1228 struct in6_addr *daddr, *final_p, final;
1339 struct ipv6_txoptions *opt = NULL; 1229 struct ipv6_txoptions *opt = NULL;
1340 struct ipv6_txoptions *opt_to_free = 1230 struct ipv6_txoptions *opt_to_free = NULL;
1341 struct ip6_flowlabel *flowlabel = NUL 1231 struct ip6_flowlabel *flowlabel = NULL;
1342 struct inet_cork_full cork; !! 1232 struct flowi6 fl6;
1343 struct flowi6 *fl6 = &cork.fl.u.ip6; <<
1344 struct dst_entry *dst; 1233 struct dst_entry *dst;
1345 struct ipcm6_cookie ipc6; 1234 struct ipcm6_cookie ipc6;
1346 int addr_len = msg->msg_namelen; 1235 int addr_len = msg->msg_namelen;
1347 bool connected = false; 1236 bool connected = false;
1348 int ulen = len; 1237 int ulen = len;
1349 int corkreq = udp_test_bit(CORK, sk) !! 1238 int corkreq = up->corkflag || msg->msg_flags&MSG_MORE;
1350 int err; 1239 int err;
1351 int is_udplite = IS_UDPLITE(sk); 1240 int is_udplite = IS_UDPLITE(sk);
1352 int (*getfrag)(void *, char *, int, i 1241 int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);
1353 1242
1354 ipcm6_init(&ipc6); 1243 ipcm6_init(&ipc6);
1355 ipc6.gso_size = READ_ONCE(up->gso_siz !! 1244 ipc6.gso_size = up->gso_size;
1356 ipc6.sockc.tsflags = READ_ONCE(sk->sk !! 1245 ipc6.sockc.tsflags = sk->sk_tsflags;
1357 ipc6.sockc.mark = READ_ONCE(sk->sk_ma !! 1246 ipc6.sockc.mark = sk->sk_mark;
1358 1247
1359 /* destination address check */ 1248 /* destination address check */
1360 if (sin6) { 1249 if (sin6) {
1361 if (addr_len < offsetof(struc 1250 if (addr_len < offsetof(struct sockaddr, sa_data))
1362 return -EINVAL; 1251 return -EINVAL;
1363 1252
1364 switch (sin6->sin6_family) { 1253 switch (sin6->sin6_family) {
1365 case AF_INET6: 1254 case AF_INET6:
1366 if (addr_len < SIN6_L 1255 if (addr_len < SIN6_LEN_RFC2133)
1367 return -EINVA 1256 return -EINVAL;
1368 daddr = &sin6->sin6_a 1257 daddr = &sin6->sin6_addr;
1369 if (ipv6_addr_any(dad 1258 if (ipv6_addr_any(daddr) &&
1370 ipv6_addr_v4mappe 1259 ipv6_addr_v4mapped(&np->saddr))
1371 ipv6_addr_set 1260 ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK),
1372 1261 daddr);
1373 break; 1262 break;
1374 case AF_INET: 1263 case AF_INET:
1375 goto do_udp_sendmsg; 1264 goto do_udp_sendmsg;
1376 case AF_UNSPEC: 1265 case AF_UNSPEC:
1377 msg->msg_name = sin6 1266 msg->msg_name = sin6 = NULL;
1378 msg->msg_namelen = ad 1267 msg->msg_namelen = addr_len = 0;
1379 daddr = NULL; 1268 daddr = NULL;
1380 break; 1269 break;
1381 default: 1270 default:
1382 return -EINVAL; 1271 return -EINVAL;
1383 } 1272 }
1384 } else if (!READ_ONCE(up->pending)) { !! 1273 } else if (!up->pending) {
1385 if (sk->sk_state != TCP_ESTAB 1274 if (sk->sk_state != TCP_ESTABLISHED)
1386 return -EDESTADDRREQ; 1275 return -EDESTADDRREQ;
1387 daddr = &sk->sk_v6_daddr; 1276 daddr = &sk->sk_v6_daddr;
1388 } else 1277 } else
1389 daddr = NULL; 1278 daddr = NULL;
1390 1279
1391 if (daddr) { 1280 if (daddr) {
1392 if (ipv6_addr_v4mapped(daddr) 1281 if (ipv6_addr_v4mapped(daddr)) {
1393 struct sockaddr_in si 1282 struct sockaddr_in sin;
1394 sin.sin_family = AF_I 1283 sin.sin_family = AF_INET;
1395 sin.sin_port = sin6 ? 1284 sin.sin_port = sin6 ? sin6->sin6_port : inet->inet_dport;
1396 sin.sin_addr.s_addr = 1285 sin.sin_addr.s_addr = daddr->s6_addr32[3];
1397 msg->msg_name = &sin; 1286 msg->msg_name = &sin;
1398 msg->msg_namelen = si 1287 msg->msg_namelen = sizeof(sin);
1399 do_udp_sendmsg: 1288 do_udp_sendmsg:
1400 err = ipv6_only_sock( !! 1289 if (__ipv6_only_sock(sk))
1401 -ENETUNREACH !! 1290 return -ENETUNREACH;
1402 msg->msg_name = sin6; !! 1291 return udp_sendmsg(sk, msg, len);
1403 msg->msg_namelen = ad <<
1404 return err; <<
1405 } 1292 }
1406 } 1293 }
1407 1294
>> 1295 if (up->pending == AF_INET)
>> 1296 return udp_sendmsg(sk, msg, len);
>> 1297
1408 /* Rough check on arithmetic overflow 1298 /* Rough check on arithmetic overflow,
1409 better check is made in ip6_append 1299 better check is made in ip6_append_data().
1410 */ 1300 */
1411 if (len > INT_MAX - sizeof(struct udp 1301 if (len > INT_MAX - sizeof(struct udphdr))
1412 return -EMSGSIZE; 1302 return -EMSGSIZE;
1413 1303
1414 getfrag = is_udplite ? udplite_get 1304 getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
1415 if (READ_ONCE(up->pending)) { !! 1305 if (up->pending) {
1416 if (READ_ONCE(up->pending) == <<
1417 return udp_sendmsg(sk <<
1418 /* 1306 /*
1419 * There are pending frames. 1307 * There are pending frames.
1420 * The socket lock must be he 1308 * The socket lock must be held while it's corked.
1421 */ 1309 */
1422 lock_sock(sk); 1310 lock_sock(sk);
1423 if (likely(up->pending)) { 1311 if (likely(up->pending)) {
1424 if (unlikely(up->pend 1312 if (unlikely(up->pending != AF_INET6)) {
1425 release_sock( 1313 release_sock(sk);
1426 return -EAFNO 1314 return -EAFNOSUPPORT;
1427 } 1315 }
1428 dst = NULL; 1316 dst = NULL;
1429 goto do_append_data; 1317 goto do_append_data;
1430 } 1318 }
1431 release_sock(sk); 1319 release_sock(sk);
1432 } 1320 }
1433 ulen += sizeof(struct udphdr); 1321 ulen += sizeof(struct udphdr);
1434 1322
1435 memset(fl6, 0, sizeof(*fl6)); !! 1323 memset(&fl6, 0, sizeof(fl6));
1436 1324
1437 if (sin6) { 1325 if (sin6) {
1438 if (sin6->sin6_port == 0) 1326 if (sin6->sin6_port == 0)
1439 return -EINVAL; 1327 return -EINVAL;
1440 1328
1441 fl6->fl6_dport = sin6->sin6_p !! 1329 fl6.fl6_dport = sin6->sin6_port;
1442 daddr = &sin6->sin6_addr; 1330 daddr = &sin6->sin6_addr;
1443 1331
1444 if (inet6_test_bit(SNDFLOW, s !! 1332 if (np->sndflow) {
1445 fl6->flowlabel = sin6 !! 1333 fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK;
1446 if (fl6->flowlabel & !! 1334 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {
1447 flowlabel = f !! 1335 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
1448 if (IS_ERR(fl 1336 if (IS_ERR(flowlabel))
1449 retur 1337 return -EINVAL;
1450 } 1338 }
1451 } 1339 }
1452 1340
1453 /* 1341 /*
1454 * Otherwise it will be diffi 1342 * Otherwise it will be difficult to maintain
1455 * sk->sk_dst_cache. 1343 * sk->sk_dst_cache.
1456 */ 1344 */
1457 if (sk->sk_state == TCP_ESTAB 1345 if (sk->sk_state == TCP_ESTABLISHED &&
1458 ipv6_addr_equal(daddr, &s 1346 ipv6_addr_equal(daddr, &sk->sk_v6_daddr))
1459 daddr = &sk->sk_v6_da 1347 daddr = &sk->sk_v6_daddr;
1460 1348
1461 if (addr_len >= sizeof(struct 1349 if (addr_len >= sizeof(struct sockaddr_in6) &&
1462 sin6->sin6_scope_id && 1350 sin6->sin6_scope_id &&
1463 __ipv6_addr_needs_scope_i 1351 __ipv6_addr_needs_scope_id(__ipv6_addr_type(daddr)))
1464 fl6->flowi6_oif = sin !! 1352 fl6.flowi6_oif = sin6->sin6_scope_id;
1465 } else { 1353 } else {
1466 if (sk->sk_state != TCP_ESTAB 1354 if (sk->sk_state != TCP_ESTABLISHED)
1467 return -EDESTADDRREQ; 1355 return -EDESTADDRREQ;
1468 1356
1469 fl6->fl6_dport = inet->inet_d !! 1357 fl6.fl6_dport = inet->inet_dport;
1470 daddr = &sk->sk_v6_daddr; 1358 daddr = &sk->sk_v6_daddr;
1471 fl6->flowlabel = np->flow_lab !! 1359 fl6.flowlabel = np->flow_label;
1472 connected = true; 1360 connected = true;
1473 } 1361 }
1474 1362
1475 if (!fl6->flowi6_oif) !! 1363 if (!fl6.flowi6_oif)
1476 fl6->flowi6_oif = READ_ONCE(s !! 1364 fl6.flowi6_oif = sk->sk_bound_dev_if;
1477 1365
1478 if (!fl6->flowi6_oif) !! 1366 if (!fl6.flowi6_oif)
1479 fl6->flowi6_oif = np->sticky_ !! 1367 fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
1480 1368
1481 fl6->flowi6_uid = sk->sk_uid; !! 1369 fl6.flowi6_mark = ipc6.sockc.mark;
>> 1370 fl6.flowi6_uid = sk->sk_uid;
1482 1371
1483 if (msg->msg_controllen) { 1372 if (msg->msg_controllen) {
1484 opt = &opt_space; 1373 opt = &opt_space;
1485 memset(opt, 0, sizeof(struct 1374 memset(opt, 0, sizeof(struct ipv6_txoptions));
1486 opt->tot_len = sizeof(*opt); 1375 opt->tot_len = sizeof(*opt);
1487 ipc6.opt = opt; 1376 ipc6.opt = opt;
1488 1377
1489 err = udp_cmsg_send(sk, msg, 1378 err = udp_cmsg_send(sk, msg, &ipc6.gso_size);
1490 if (err > 0) { !! 1379 if (err > 0)
1491 err = ip6_datagram_se !! 1380 err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6,
1492 1381 &ipc6);
1493 connected = false; <<
1494 } <<
1495 if (err < 0) { 1382 if (err < 0) {
1496 fl6_sock_release(flow 1383 fl6_sock_release(flowlabel);
1497 return err; 1384 return err;
1498 } 1385 }
1499 if ((fl6->flowlabel&IPV6_FLOW !! 1386 if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) {
1500 flowlabel = fl6_sock_ !! 1387 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
1501 if (IS_ERR(flowlabel) 1388 if (IS_ERR(flowlabel))
1502 return -EINVA 1389 return -EINVAL;
1503 } 1390 }
1504 if (!(opt->opt_nflen|opt->opt 1391 if (!(opt->opt_nflen|opt->opt_flen))
1505 opt = NULL; 1392 opt = NULL;
>> 1393 connected = false;
1506 } 1394 }
1507 if (!opt) { 1395 if (!opt) {
1508 opt = txopt_get(np); 1396 opt = txopt_get(np);
1509 opt_to_free = opt; 1397 opt_to_free = opt;
1510 } 1398 }
1511 if (flowlabel) 1399 if (flowlabel)
1512 opt = fl6_merge_options(&opt_ 1400 opt = fl6_merge_options(&opt_space, flowlabel, opt);
1513 opt = ipv6_fixup_options(&opt_space, 1401 opt = ipv6_fixup_options(&opt_space, opt);
1514 ipc6.opt = opt; 1402 ipc6.opt = opt;
1515 1403
1516 fl6->flowi6_proto = sk->sk_protocol; !! 1404 fl6.flowi6_proto = sk->sk_protocol;
1517 fl6->flowi6_mark = ipc6.sockc.mark; !! 1405 fl6.daddr = *daddr;
1518 fl6->daddr = *daddr; !! 1406 if (ipv6_addr_any(&fl6.saddr) && !ipv6_addr_any(&np->saddr))
1519 if (ipv6_addr_any(&fl6->saddr) && !ip !! 1407 fl6.saddr = np->saddr;
1520 fl6->saddr = np->saddr; !! 1408 fl6.fl6_sport = inet->inet_sport;
1521 fl6->fl6_sport = inet->inet_sport; <<
1522 1409
1523 if (cgroup_bpf_enabled(CGROUP_UDP6_SE !! 1410 if (cgroup_bpf_enabled && !connected) {
1524 err = BPF_CGROUP_RUN_PROG_UDP 1411 err = BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK(sk,
1525 (s !! 1412 (struct sockaddr *)sin6, &fl6.saddr);
1526 &a <<
1527 &f <<
1528 if (err) 1413 if (err)
1529 goto out_no_dst; 1414 goto out_no_dst;
1530 if (sin6) { 1415 if (sin6) {
1531 if (ipv6_addr_v4mappe 1416 if (ipv6_addr_v4mapped(&sin6->sin6_addr)) {
1532 /* BPF progra 1417 /* BPF program rewrote IPv6-only by IPv4-mapped
1533 * IPv6. It's 1418 * IPv6. It's currently unsupported.
1534 */ 1419 */
1535 err = -ENOTSU 1420 err = -ENOTSUPP;
1536 goto out_no_d 1421 goto out_no_dst;
1537 } 1422 }
1538 if (sin6->sin6_port = 1423 if (sin6->sin6_port == 0) {
1539 /* BPF progra 1424 /* BPF program set invalid port. Reject it. */
1540 err = -EINVAL 1425 err = -EINVAL;
1541 goto out_no_d 1426 goto out_no_dst;
1542 } 1427 }
1543 fl6->fl6_dport = sin6 !! 1428 fl6.fl6_dport = sin6->sin6_port;
1544 fl6->daddr = sin6->si !! 1429 fl6.daddr = sin6->sin6_addr;
1545 } 1430 }
1546 } 1431 }
1547 1432
1548 if (ipv6_addr_any(&fl6->daddr)) !! 1433 if (ipv6_addr_any(&fl6.daddr))
1549 fl6->daddr.s6_addr[15] = 0x1; !! 1434 fl6.daddr.s6_addr[15] = 0x1; /* :: means loopback (BSD'ism) */
1550 1435
1551 final_p = fl6_update_dst(fl6, opt, &f !! 1436 final_p = fl6_update_dst(&fl6, opt, &final);
1552 if (final_p) 1437 if (final_p)
1553 connected = false; 1438 connected = false;
1554 1439
1555 if (!fl6->flowi6_oif && ipv6_addr_is_ !! 1440 if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) {
1556 fl6->flowi6_oif = READ_ONCE(n !! 1441 fl6.flowi6_oif = np->mcast_oif;
1557 connected = false; 1442 connected = false;
1558 } else if (!fl6->flowi6_oif) !! 1443 } else if (!fl6.flowi6_oif)
1559 fl6->flowi6_oif = READ_ONCE(n !! 1444 fl6.flowi6_oif = np->ucast_oif;
1560 1445
1561 security_sk_classify_flow(sk, flowi6_ !! 1446 security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
1562 1447
1563 if (ipc6.tclass < 0) 1448 if (ipc6.tclass < 0)
1564 ipc6.tclass = np->tclass; 1449 ipc6.tclass = np->tclass;
1565 1450
1566 fl6->flowlabel = ip6_make_flowinfo(ip !! 1451 fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);
1567 1452
1568 dst = ip6_sk_dst_lookup_flow(sk, fl6, !! 1453 dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p, connected);
1569 if (IS_ERR(dst)) { 1454 if (IS_ERR(dst)) {
1570 err = PTR_ERR(dst); 1455 err = PTR_ERR(dst);
1571 dst = NULL; 1456 dst = NULL;
1572 goto out; 1457 goto out;
1573 } 1458 }
1574 1459
1575 if (ipc6.hlimit < 0) 1460 if (ipc6.hlimit < 0)
1576 ipc6.hlimit = ip6_sk_dst_hopl !! 1461 ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);
1577 1462
1578 if (msg->msg_flags&MSG_CONFIRM) 1463 if (msg->msg_flags&MSG_CONFIRM)
1579 goto do_confirm; 1464 goto do_confirm;
1580 back_from_confirm: 1465 back_from_confirm:
1581 1466
1582 /* Lockless fast path for the non-cor 1467 /* Lockless fast path for the non-corking case */
1583 if (!corkreq) { 1468 if (!corkreq) {
>> 1469 struct inet_cork_full cork;
1584 struct sk_buff *skb; 1470 struct sk_buff *skb;
1585 1471
1586 skb = ip6_make_skb(sk, getfra 1472 skb = ip6_make_skb(sk, getfrag, msg, ulen,
1587 sizeof(str 1473 sizeof(struct udphdr), &ipc6,
1588 dst_rt6_in !! 1474 &fl6, (struct rt6_info *)dst,
1589 msg->msg_f 1475 msg->msg_flags, &cork);
1590 err = PTR_ERR(skb); 1476 err = PTR_ERR(skb);
1591 if (!IS_ERR_OR_NULL(skb)) 1477 if (!IS_ERR_OR_NULL(skb))
1592 err = udp_v6_send_skb !! 1478 err = udp_v6_send_skb(skb, &fl6, &cork.base);
1593 /* ip6_make_skb steals dst re !! 1479 goto out;
1594 goto out_no_dst; <<
1595 } 1480 }
1596 1481
1597 lock_sock(sk); 1482 lock_sock(sk);
1598 if (unlikely(up->pending)) { 1483 if (unlikely(up->pending)) {
1599 /* The socket is already cork 1484 /* The socket is already corked while preparing it. */
1600 /* ... which is an evident ap 1485 /* ... which is an evident application bug. --ANK */
1601 release_sock(sk); 1486 release_sock(sk);
1602 1487
1603 net_dbg_ratelimited("udp cork 1488 net_dbg_ratelimited("udp cork app bug 2\n");
1604 err = -EINVAL; 1489 err = -EINVAL;
1605 goto out; 1490 goto out;
1606 } 1491 }
1607 1492
1608 WRITE_ONCE(up->pending, AF_INET6); !! 1493 up->pending = AF_INET6;
1609 1494
1610 do_append_data: 1495 do_append_data:
1611 if (ipc6.dontfrag < 0) 1496 if (ipc6.dontfrag < 0)
1612 ipc6.dontfrag = inet6_test_bi !! 1497 ipc6.dontfrag = np->dontfrag;
1613 up->len += ulen; 1498 up->len += ulen;
1614 err = ip6_append_data(sk, getfrag, ms 1499 err = ip6_append_data(sk, getfrag, msg, ulen, sizeof(struct udphdr),
1615 &ipc6, fl6, dst !! 1500 &ipc6, &fl6, (struct rt6_info *)dst,
1616 corkreq ? msg-> 1501 corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);
1617 if (err) 1502 if (err)
1618 udp_v6_flush_pending_frames(s 1503 udp_v6_flush_pending_frames(sk);
1619 else if (!corkreq) 1504 else if (!corkreq)
1620 err = udp_v6_push_pending_fra 1505 err = udp_v6_push_pending_frames(sk);
1621 else if (unlikely(skb_queue_empty(&sk 1506 else if (unlikely(skb_queue_empty(&sk->sk_write_queue)))
1622 WRITE_ONCE(up->pending, 0); !! 1507 up->pending = 0;
1623 1508
1624 if (err > 0) 1509 if (err > 0)
1625 err = inet6_test_bit(RECVERR6 !! 1510 err = np->recverr ? net_xmit_errno(err) : 0;
1626 release_sock(sk); 1511 release_sock(sk);
1627 1512
1628 out: 1513 out:
1629 dst_release(dst); 1514 dst_release(dst);
1630 out_no_dst: 1515 out_no_dst:
1631 fl6_sock_release(flowlabel); 1516 fl6_sock_release(flowlabel);
1632 txopt_put(opt_to_free); 1517 txopt_put(opt_to_free);
1633 if (!err) 1518 if (!err)
1634 return len; 1519 return len;
1635 /* 1520 /*
1636 * ENOBUFS = no kernel mem, SOCK_NOSP 1521 * ENOBUFS = no kernel mem, SOCK_NOSPACE = no sndbuf space. Reporting
1637 * ENOBUFS might not be good (it's no 1522 * ENOBUFS might not be good (it's not tunable per se), but otherwise
1638 * we don't have a good statistic (Ip 1523 * we don't have a good statistic (IpOutDiscards but it can be too many
1639 * things). We could add another new 1524 * things). We could add another new stat but at least for now that
1640 * seems like overkill. 1525 * seems like overkill.
1641 */ 1526 */
1642 if (err == -ENOBUFS || test_bit(SOCK_ 1527 if (err == -ENOBUFS || test_bit(SOCK_NOSPACE, &sk->sk_socket->flags)) {
1643 UDP6_INC_STATS(sock_net(sk), 1528 UDP6_INC_STATS(sock_net(sk),
1644 UDP_MIB_SNDBUF 1529 UDP_MIB_SNDBUFERRORS, is_udplite);
1645 } 1530 }
1646 return err; 1531 return err;
1647 1532
1648 do_confirm: 1533 do_confirm:
1649 if (msg->msg_flags & MSG_PROBE) 1534 if (msg->msg_flags & MSG_PROBE)
1650 dst_confirm_neigh(dst, &fl6-> !! 1535 dst_confirm_neigh(dst, &fl6.daddr);
1651 if (!(msg->msg_flags&MSG_PROBE) || le 1536 if (!(msg->msg_flags&MSG_PROBE) || len)
1652 goto back_from_confirm; 1537 goto back_from_confirm;
1653 err = 0; 1538 err = 0;
1654 goto out; 1539 goto out;
1655 } 1540 }
1656 EXPORT_SYMBOL(udpv6_sendmsg); <<
1657 <<
1658 static void udpv6_splice_eof(struct socket *s <<
1659 { <<
1660 struct sock *sk = sock->sk; <<
1661 struct udp_sock *up = udp_sk(sk); <<
1662 <<
1663 if (!READ_ONCE(up->pending) || udp_te <<
1664 return; <<
1665 <<
1666 lock_sock(sk); <<
1667 if (up->pending && !udp_test_bit(CORK <<
1668 udp_v6_push_pending_frames(sk <<
1669 release_sock(sk); <<
1670 } <<
1671 1541
1672 void udpv6_destroy_sock(struct sock *sk) 1542 void udpv6_destroy_sock(struct sock *sk)
1673 { 1543 {
1674 struct udp_sock *up = udp_sk(sk); 1544 struct udp_sock *up = udp_sk(sk);
1675 lock_sock(sk); 1545 lock_sock(sk);
1676 <<
1677 /* protects from races with udp_abort <<
1678 sock_set_flag(sk, SOCK_DEAD); <<
1679 udp_v6_flush_pending_frames(sk); 1546 udp_v6_flush_pending_frames(sk);
1680 release_sock(sk); 1547 release_sock(sk);
1681 1548
1682 if (static_branch_unlikely(&udpv6_enc 1549 if (static_branch_unlikely(&udpv6_encap_needed_key)) {
1683 if (up->encap_type) { 1550 if (up->encap_type) {
1684 void (*encap_destroy) 1551 void (*encap_destroy)(struct sock *sk);
1685 encap_destroy = READ_ 1552 encap_destroy = READ_ONCE(up->encap_destroy);
1686 if (encap_destroy) 1553 if (encap_destroy)
1687 encap_destroy 1554 encap_destroy(sk);
1688 } 1555 }
1689 if (udp_test_bit(ENCAP_ENABLE !! 1556 if (up->encap_enabled)
1690 static_branch_dec(&ud 1557 static_branch_dec(&udpv6_encap_needed_key);
1691 udp_encap_disable(); <<
1692 } <<
1693 } 1558 }
>> 1559
>> 1560 inet6_destroy_sock(sk);
1694 } 1561 }
1695 1562
1696 /* 1563 /*
1697 * Socket option code for UDP 1564 * Socket option code for UDP
1698 */ 1565 */
1699 int udpv6_setsockopt(struct sock *sk, int lev !! 1566 int udpv6_setsockopt(struct sock *sk, int level, int optname,
1700 unsigned int optlen) !! 1567 char __user *optval, unsigned int optlen)
1701 { 1568 {
1702 if (level == SOL_UDP || level == SO !! 1569 if (level == SOL_UDP || level == SOL_UDPLITE)
1703 return udp_lib_setsockopt(sk, !! 1570 return udp_lib_setsockopt(sk, level, optname, optval, optlen,
1704 opt <<
1705 udp 1571 udp_v6_push_pending_frames);
1706 return ipv6_setsockopt(sk, level, opt 1572 return ipv6_setsockopt(sk, level, optname, optval, optlen);
1707 } 1573 }
1708 1574
>> 1575 #ifdef CONFIG_COMPAT
>> 1576 int compat_udpv6_setsockopt(struct sock *sk, int level, int optname,
>> 1577 char __user *optval, unsigned int optlen)
>> 1578 {
>> 1579 if (level == SOL_UDP || level == SOL_UDPLITE)
>> 1580 return udp_lib_setsockopt(sk, level, optname, optval, optlen,
>> 1581 udp_v6_push_pending_frames);
>> 1582 return compat_ipv6_setsockopt(sk, level, optname, optval, optlen);
>> 1583 }
>> 1584 #endif
>> 1585
1709 int udpv6_getsockopt(struct sock *sk, int lev 1586 int udpv6_getsockopt(struct sock *sk, int level, int optname,
1710 char __user *optval, int 1587 char __user *optval, int __user *optlen)
1711 { 1588 {
1712 if (level == SOL_UDP || level == SO 1589 if (level == SOL_UDP || level == SOL_UDPLITE)
1713 return udp_lib_getsockopt(sk, 1590 return udp_lib_getsockopt(sk, level, optname, optval, optlen);
1714 return ipv6_getsockopt(sk, level, opt 1591 return ipv6_getsockopt(sk, level, optname, optval, optlen);
1715 } 1592 }
1716 1593
>> 1594 #ifdef CONFIG_COMPAT
>> 1595 int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
>> 1596 char __user *optval, int __user *optlen)
>> 1597 {
>> 1598 if (level == SOL_UDP || level == SOL_UDPLITE)
>> 1599 return udp_lib_getsockopt(sk, level, optname, optval, optlen);
>> 1600 return compat_ipv6_getsockopt(sk, level, optname, optval, optlen);
>> 1601 }
>> 1602 #endif
>> 1603
>> 1604 /* thinking of making this const? Don't.
>> 1605 * early_demux can change based on sysctl.
>> 1606 */
>> 1607 static struct inet6_protocol udpv6_protocol = {
>> 1608 .early_demux = udp_v6_early_demux,
>> 1609 .early_demux_handler = udp_v6_early_demux,
>> 1610 .handler = udpv6_rcv,
>> 1611 .err_handler = udpv6_err,
>> 1612 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
>> 1613 };
1717 1614
1718 /* ------------------------------------------ 1615 /* ------------------------------------------------------------------------ */
1719 #ifdef CONFIG_PROC_FS 1616 #ifdef CONFIG_PROC_FS
1720 int udp6_seq_show(struct seq_file *seq, void 1617 int udp6_seq_show(struct seq_file *seq, void *v)
1721 { 1618 {
1722 if (v == SEQ_START_TOKEN) { 1619 if (v == SEQ_START_TOKEN) {
1723 seq_puts(seq, IPV6_SEQ_DGRAM_ 1620 seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
1724 } else { 1621 } else {
1725 int bucket = ((struct udp_ite 1622 int bucket = ((struct udp_iter_state *)seq->private)->bucket;
1726 const struct inet_sock *inet !! 1623 struct inet_sock *inet = inet_sk(v);
1727 __u16 srcp = ntohs(inet->inet 1624 __u16 srcp = ntohs(inet->inet_sport);
1728 __u16 destp = ntohs(inet->ine 1625 __u16 destp = ntohs(inet->inet_dport);
1729 __ip6_dgram_sock_seq_show(seq 1626 __ip6_dgram_sock_seq_show(seq, v, srcp, destp,
1730 udp 1627 udp_rqueue_get(v), bucket);
1731 } 1628 }
1732 return 0; 1629 return 0;
1733 } 1630 }
1734 1631
1735 const struct seq_operations udp6_seq_ops = { 1632 const struct seq_operations udp6_seq_ops = {
1736 .start = udp_seq_start, 1633 .start = udp_seq_start,
1737 .next = udp_seq_next, 1634 .next = udp_seq_next,
1738 .stop = udp_seq_stop, 1635 .stop = udp_seq_stop,
1739 .show = udp6_seq_show, 1636 .show = udp6_seq_show,
1740 }; 1637 };
1741 EXPORT_SYMBOL(udp6_seq_ops); 1638 EXPORT_SYMBOL(udp6_seq_ops);
1742 1639
1743 static struct udp_seq_afinfo udp6_seq_afinfo 1640 static struct udp_seq_afinfo udp6_seq_afinfo = {
1744 .family = AF_INET6, 1641 .family = AF_INET6,
1745 .udp_table = NULL, !! 1642 .udp_table = &udp_table,
1746 }; 1643 };
1747 1644
1748 int __net_init udp6_proc_init(struct net *net 1645 int __net_init udp6_proc_init(struct net *net)
1749 { 1646 {
1750 if (!proc_create_net_data("udp6", 044 1647 if (!proc_create_net_data("udp6", 0444, net->proc_net, &udp6_seq_ops,
1751 sizeof(struct udp_ite 1648 sizeof(struct udp_iter_state), &udp6_seq_afinfo))
1752 return -ENOMEM; 1649 return -ENOMEM;
1753 return 0; 1650 return 0;
1754 } 1651 }
1755 1652
1756 void udp6_proc_exit(struct net *net) 1653 void udp6_proc_exit(struct net *net)
1757 { 1654 {
1758 remove_proc_entry("udp6", net->proc_n 1655 remove_proc_entry("udp6", net->proc_net);
1759 } 1656 }
1760 #endif /* CONFIG_PROC_FS */ 1657 #endif /* CONFIG_PROC_FS */
1761 1658
1762 /* ------------------------------------------ 1659 /* ------------------------------------------------------------------------ */
1763 1660
1764 struct proto udpv6_prot = { 1661 struct proto udpv6_prot = {
1765 .name = "UDPv6", 1662 .name = "UDPv6",
1766 .owner = THIS_MODULE 1663 .owner = THIS_MODULE,
1767 .close = udp_lib_clo 1664 .close = udp_lib_close,
1768 .pre_connect = udpv6_pre_c 1665 .pre_connect = udpv6_pre_connect,
1769 .connect = ip6_datagra 1666 .connect = ip6_datagram_connect,
1770 .disconnect = udp_disconn 1667 .disconnect = udp_disconnect,
1771 .ioctl = udp_ioctl, 1668 .ioctl = udp_ioctl,
1772 .init = udpv6_init_ !! 1669 .init = udp_init_sock,
1773 .destroy = udpv6_destr 1670 .destroy = udpv6_destroy_sock,
1774 .setsockopt = udpv6_setso 1671 .setsockopt = udpv6_setsockopt,
1775 .getsockopt = udpv6_getso 1672 .getsockopt = udpv6_getsockopt,
1776 .sendmsg = udpv6_sendm 1673 .sendmsg = udpv6_sendmsg,
1777 .recvmsg = udpv6_recvm 1674 .recvmsg = udpv6_recvmsg,
1778 .splice_eof = udpv6_splic <<
1779 .release_cb = ip6_datagra 1675 .release_cb = ip6_datagram_release_cb,
1780 .hash = udp_lib_has 1676 .hash = udp_lib_hash,
1781 .unhash = udp_lib_unh 1677 .unhash = udp_lib_unhash,
1782 .rehash = udp_v6_reha 1678 .rehash = udp_v6_rehash,
1783 .get_port = udp_v6_get_ 1679 .get_port = udp_v6_get_port,
1784 .put_port = udp_lib_unh <<
1785 #ifdef CONFIG_BPF_SYSCALL <<
1786 .psock_update_sk_prot = udp_bpf_upd <<
1787 #endif <<
1788 <<
1789 .memory_allocated = &udp_memory 1680 .memory_allocated = &udp_memory_allocated,
1790 .per_cpu_fw_alloc = &udp_memory <<
1791 <<
1792 .sysctl_mem = sysctl_udp_ 1681 .sysctl_mem = sysctl_udp_mem,
1793 .sysctl_wmem_offset = offsetof(st 1682 .sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min),
1794 .sysctl_rmem_offset = offsetof(st 1683 .sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_udp_rmem_min),
1795 .obj_size = sizeof(stru 1684 .obj_size = sizeof(struct udp6_sock),
1796 .ipv6_pinfo_offset = offsetof(struct !! 1685 .h.udp_table = &udp_table,
1797 .h.udp_table = NULL, !! 1686 #ifdef CONFIG_COMPAT
>> 1687 .compat_setsockopt = compat_udpv6_setsockopt,
>> 1688 .compat_getsockopt = compat_udpv6_getsockopt,
>> 1689 #endif
1798 .diag_destroy = udp_abort, 1690 .diag_destroy = udp_abort,
1799 }; 1691 };
1800 1692
1801 static struct inet_protosw udpv6_protosw = { 1693 static struct inet_protosw udpv6_protosw = {
1802 .type = SOCK_DGRAM, 1694 .type = SOCK_DGRAM,
1803 .protocol = IPPROTO_UDP, 1695 .protocol = IPPROTO_UDP,
1804 .prot = &udpv6_prot, 1696 .prot = &udpv6_prot,
1805 .ops = &inet6_dgram_ops, 1697 .ops = &inet6_dgram_ops,
1806 .flags = INET_PROTOSW_PERMANENT, 1698 .flags = INET_PROTOSW_PERMANENT,
1807 }; 1699 };
1808 1700
1809 int __init udpv6_init(void) 1701 int __init udpv6_init(void)
1810 { 1702 {
1811 int ret; 1703 int ret;
1812 1704
1813 net_hotdata.udpv6_protocol = (struct !! 1705 ret = inet6_add_protocol(&udpv6_protocol, IPPROTO_UDP);
1814 .handler = udpv6_rcv, <<
1815 .err_handler = udpv6_err, <<
1816 .flags = INET6_PROTO_NO <<
1817 }; <<
1818 ret = inet6_add_protocol(&net_hotdata <<
1819 if (ret) 1706 if (ret)
1820 goto out; 1707 goto out;
1821 1708
1822 ret = inet6_register_protosw(&udpv6_p 1709 ret = inet6_register_protosw(&udpv6_protosw);
1823 if (ret) 1710 if (ret)
1824 goto out_udpv6_protocol; 1711 goto out_udpv6_protocol;
1825 out: 1712 out:
1826 return ret; 1713 return ret;
1827 1714
1828 out_udpv6_protocol: 1715 out_udpv6_protocol:
1829 inet6_del_protocol(&net_hotdata.udpv6 !! 1716 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
1830 goto out; 1717 goto out;
1831 } 1718 }
1832 1719
1833 void udpv6_exit(void) 1720 void udpv6_exit(void)
1834 { 1721 {
1835 inet6_unregister_protosw(&udpv6_proto 1722 inet6_unregister_protosw(&udpv6_protosw);
1836 inet6_del_protocol(&net_hotdata.udpv6 !! 1723 inet6_del_protocol(&udpv6_protocol, IPPROTO_UDP);
1837 } 1724 }
1838 1725
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.