Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3a06a68b40164cc73b89017a5ec9eec925037631

Authored by subashab@codeaurora.org
Committed by Greg Kroah-Hartman
1 parent faf8cf001d

ping: Fix race in free in receive path 

[ Upstream commit fc752f1f43c1c038a2c6ae58cc739ebb5953ccb0 ]

An exception is seen in ICMP ping receive path where the skb
destructor sock_rfree() tries to access a freed socket. This happens
because ping_rcv() releases socket reference with sock_put() and this
internally frees up the socket. Later icmp_rcv() will try to free the
skb and as part of this, skb destructor is called and which leads
to a kernel panic as the socket is freed already in ping_rcv().

-->|exception
-007|sk_mem_uncharge
-007|sock_rfree
-008|skb_release_head_state
-009|skb_release_all
-009|__kfree_skb
-010|kfree_skb
-011|icmp_rcv
-012|ip_local_deliver_finish

Fix this incorrect free by cloning this skb and processing this cloned
skb instead.

This patch was suggested by Eric Dumazet

Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 1 deletions Inline Diff

1 /* 1 /*
2 * INET An implementation of the TCP/IP protocol suite for the LINUX 2 * INET An implementation of the TCP/IP protocol suite for the LINUX
3 * operating system. INET is implemented using the BSD Socket 3 * operating system. INET is implemented using the BSD Socket
4 * interface as the means of communication with the user level. 4 * interface as the means of communication with the user level.
5 * 5 *
6 * "Ping" sockets 6 * "Ping" sockets
7 * 7 *
8 * This program is free software; you can redistribute it and/or 8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License 9 * modify it under the terms of the GNU General Public License
10 * as published by the Free Software Foundation; either version 10 * as published by the Free Software Foundation; either version
11 * 2 of the License, or (at your option) any later version. 11 * 2 of the License, or (at your option) any later version.
12 * 12 *
13 * Based on ipv4/udp.c code. 13 * Based on ipv4/udp.c code.
14 * 14 *
15 * Authors: Vasiliy Kulikov / Openwall (for Linux 2.6), 15 * Authors: Vasiliy Kulikov / Openwall (for Linux 2.6),
16 * Pavel Kankovsky (for Linux 2.4.32) 16 * Pavel Kankovsky (for Linux 2.4.32)
17 * 17 *
18 * Pavel gave all rights to bugs to Vasiliy, 18 * Pavel gave all rights to bugs to Vasiliy,
19 * none of the bugs are Pavel's now. 19 * none of the bugs are Pavel's now.
20 * 20 *
21 */ 21 */
22 22
23 #include <linux/uaccess.h> 23 #include <linux/uaccess.h>
24 #include <linux/types.h> 24 #include <linux/types.h>
25 #include <linux/fcntl.h> 25 #include <linux/fcntl.h>
26 #include <linux/socket.h> 26 #include <linux/socket.h>
27 #include <linux/sockios.h> 27 #include <linux/sockios.h>
28 #include <linux/in.h> 28 #include <linux/in.h>
29 #include <linux/errno.h> 29 #include <linux/errno.h>
30 #include <linux/timer.h> 30 #include <linux/timer.h>
31 #include <linux/mm.h> 31 #include <linux/mm.h>
32 #include <linux/inet.h> 32 #include <linux/inet.h>
33 #include <linux/netdevice.h> 33 #include <linux/netdevice.h>
34 #include <net/snmp.h> 34 #include <net/snmp.h>
35 #include <net/ip.h> 35 #include <net/ip.h>
36 #include <net/icmp.h> 36 #include <net/icmp.h>
37 #include <net/protocol.h> 37 #include <net/protocol.h>
38 #include <linux/skbuff.h> 38 #include <linux/skbuff.h>
39 #include <linux/proc_fs.h> 39 #include <linux/proc_fs.h>
40 #include <linux/export.h> 40 #include <linux/export.h>
41 #include <net/sock.h> 41 #include <net/sock.h>
42 #include <net/ping.h> 42 #include <net/ping.h>
43 #include <net/udp.h> 43 #include <net/udp.h>
44 #include <net/route.h> 44 #include <net/route.h>
45 #include <net/inet_common.h> 45 #include <net/inet_common.h>
46 #include <net/checksum.h> 46 #include <net/checksum.h>
47 47
48 #if IS_ENABLED(CONFIG_IPV6) 48 #if IS_ENABLED(CONFIG_IPV6)
49 #include <linux/in6.h> 49 #include <linux/in6.h>
50 #include <linux/icmpv6.h> 50 #include <linux/icmpv6.h>
51 #include <net/addrconf.h> 51 #include <net/addrconf.h>
52 #include <net/ipv6.h> 52 #include <net/ipv6.h>
53 #include <net/transp_v6.h> 53 #include <net/transp_v6.h>
54 #endif 54 #endif
55 55
56 struct ping_table { 56 struct ping_table {
57 struct hlist_nulls_head hash[PING_HTABLE_SIZE]; 57 struct hlist_nulls_head hash[PING_HTABLE_SIZE];
58 rwlock_t lock; 58 rwlock_t lock;
59 }; 59 };
60 60
61 static struct ping_table ping_table; 61 static struct ping_table ping_table;
62 struct pingv6_ops pingv6_ops; 62 struct pingv6_ops pingv6_ops;
63 EXPORT_SYMBOL_GPL(pingv6_ops); 63 EXPORT_SYMBOL_GPL(pingv6_ops);
64 64
65 static u16 ping_port_rover; 65 static u16 ping_port_rover;
66 66
67 static inline int ping_hashfn(struct net *net, unsigned int num, unsigned int mask) 67 static inline int ping_hashfn(struct net *net, unsigned int num, unsigned int mask)
68 { 68 {
69 int res = (num + net_hash_mix(net)) & mask; 69 int res = (num + net_hash_mix(net)) & mask;
70 70
71 pr_debug("hash(%d) = %d\n", num, res); 71 pr_debug("hash(%d) = %d\n", num, res);
72 return res; 72 return res;
73 } 73 }
74 EXPORT_SYMBOL_GPL(ping_hash); 74 EXPORT_SYMBOL_GPL(ping_hash);
75 75
76 static inline struct hlist_nulls_head *ping_hashslot(struct ping_table *table, 76 static inline struct hlist_nulls_head *ping_hashslot(struct ping_table *table,
77 struct net *net, unsigned int num) 77 struct net *net, unsigned int num)
78 { 78 {
79 return &table->hash[ping_hashfn(net, num, PING_HTABLE_MASK)]; 79 return &table->hash[ping_hashfn(net, num, PING_HTABLE_MASK)];
80 } 80 }
81 81
82 int ping_get_port(struct sock *sk, unsigned short ident) 82 int ping_get_port(struct sock *sk, unsigned short ident)
83 { 83 {
84 struct hlist_nulls_node *node; 84 struct hlist_nulls_node *node;
85 struct hlist_nulls_head *hlist; 85 struct hlist_nulls_head *hlist;
86 struct inet_sock *isk, *isk2; 86 struct inet_sock *isk, *isk2;
87 struct sock *sk2 = NULL; 87 struct sock *sk2 = NULL;
88 88
89 isk = inet_sk(sk); 89 isk = inet_sk(sk);
90 write_lock_bh(&ping_table.lock); 90 write_lock_bh(&ping_table.lock);
91 if (ident == 0) { 91 if (ident == 0) {
92 u32 i; 92 u32 i;
93 u16 result = ping_port_rover + 1; 93 u16 result = ping_port_rover + 1;
94 94
95 for (i = 0; i < (1L << 16); i++, result++) { 95 for (i = 0; i < (1L << 16); i++, result++) {
96 if (!result) 96 if (!result)
97 result++; /* avoid zero */ 97 result++; /* avoid zero */
98 hlist = ping_hashslot(&ping_table, sock_net(sk), 98 hlist = ping_hashslot(&ping_table, sock_net(sk),
99 result); 99 result);
100 ping_portaddr_for_each_entry(sk2, node, hlist) { 100 ping_portaddr_for_each_entry(sk2, node, hlist) {
101 isk2 = inet_sk(sk2); 101 isk2 = inet_sk(sk2);
102 102
103 if (isk2->inet_num == result) 103 if (isk2->inet_num == result)
104 goto next_port; 104 goto next_port;
105 } 105 }
106 106
107 /* found */ 107 /* found */
108 ping_port_rover = ident = result; 108 ping_port_rover = ident = result;
109 break; 109 break;
110 next_port: 110 next_port:
111 ; 111 ;
112 } 112 }
113 if (i >= (1L << 16)) 113 if (i >= (1L << 16))
114 goto fail; 114 goto fail;
115 } else { 115 } else {
116 hlist = ping_hashslot(&ping_table, sock_net(sk), ident); 116 hlist = ping_hashslot(&ping_table, sock_net(sk), ident);
117 ping_portaddr_for_each_entry(sk2, node, hlist) { 117 ping_portaddr_for_each_entry(sk2, node, hlist) {
118 isk2 = inet_sk(sk2); 118 isk2 = inet_sk(sk2);
119 119
120 /* BUG? Why is this reuse and not reuseaddr? ping.c 120 /* BUG? Why is this reuse and not reuseaddr? ping.c
121 * doesn't turn off SO_REUSEADDR, and it doesn't expect 121 * doesn't turn off SO_REUSEADDR, and it doesn't expect
122 * that other ping processes can steal its packets. 122 * that other ping processes can steal its packets.
123 */ 123 */
124 if ((isk2->inet_num == ident) && 124 if ((isk2->inet_num == ident) &&
125 (sk2 != sk) && 125 (sk2 != sk) &&
126 (!sk2->sk_reuse || !sk->sk_reuse)) 126 (!sk2->sk_reuse || !sk->sk_reuse))
127 goto fail; 127 goto fail;
128 } 128 }
129 } 129 }
130 130
131 pr_debug("found port/ident = %d\n", ident); 131 pr_debug("found port/ident = %d\n", ident);
132 isk->inet_num = ident; 132 isk->inet_num = ident;
133 if (sk_unhashed(sk)) { 133 if (sk_unhashed(sk)) {
134 pr_debug("was not hashed\n"); 134 pr_debug("was not hashed\n");
135 sock_hold(sk); 135 sock_hold(sk);
136 hlist_nulls_add_head(&sk->sk_nulls_node, hlist); 136 hlist_nulls_add_head(&sk->sk_nulls_node, hlist);
137 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); 137 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
138 } 138 }
139 write_unlock_bh(&ping_table.lock); 139 write_unlock_bh(&ping_table.lock);
140 return 0; 140 return 0;
141 141
142 fail: 142 fail:
143 write_unlock_bh(&ping_table.lock); 143 write_unlock_bh(&ping_table.lock);
144 return 1; 144 return 1;
145 } 145 }
146 EXPORT_SYMBOL_GPL(ping_get_port); 146 EXPORT_SYMBOL_GPL(ping_get_port);
147 147
148 void ping_hash(struct sock *sk) 148 void ping_hash(struct sock *sk)
149 { 149 {
150 pr_debug("ping_hash(sk->port=%u)\n", inet_sk(sk)->inet_num); 150 pr_debug("ping_hash(sk->port=%u)\n", inet_sk(sk)->inet_num);
151 BUG(); /* "Please do not press this button again." */ 151 BUG(); /* "Please do not press this button again." */
152 } 152 }
153 153
154 void ping_unhash(struct sock *sk) 154 void ping_unhash(struct sock *sk)
155 { 155 {
156 struct inet_sock *isk = inet_sk(sk); 156 struct inet_sock *isk = inet_sk(sk);
157 pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num); 157 pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num);
158 if (sk_hashed(sk)) { 158 if (sk_hashed(sk)) {
159 write_lock_bh(&ping_table.lock); 159 write_lock_bh(&ping_table.lock);
160 hlist_nulls_del(&sk->sk_nulls_node); 160 hlist_nulls_del(&sk->sk_nulls_node);
161 sock_put(sk); 161 sock_put(sk);
162 isk->inet_num = 0; 162 isk->inet_num = 0;
163 isk->inet_sport = 0; 163 isk->inet_sport = 0;
164 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); 164 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
165 write_unlock_bh(&ping_table.lock); 165 write_unlock_bh(&ping_table.lock);
166 } 166 }
167 } 167 }
168 EXPORT_SYMBOL_GPL(ping_unhash); 168 EXPORT_SYMBOL_GPL(ping_unhash);
169 169
170 static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) 170 static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)
171 { 171 {
172 struct hlist_nulls_head *hslot = ping_hashslot(&ping_table, net, ident); 172 struct hlist_nulls_head *hslot = ping_hashslot(&ping_table, net, ident);
173 struct sock *sk = NULL; 173 struct sock *sk = NULL;
174 struct inet_sock *isk; 174 struct inet_sock *isk;
175 struct hlist_nulls_node *hnode; 175 struct hlist_nulls_node *hnode;
176 int dif = skb->dev->ifindex; 176 int dif = skb->dev->ifindex;
177 177
178 if (skb->protocol == htons(ETH_P_IP)) { 178 if (skb->protocol == htons(ETH_P_IP)) {
179 pr_debug("try to find: num = %d, daddr = %pI4, dif = %d\n", 179 pr_debug("try to find: num = %d, daddr = %pI4, dif = %d\n",
180 (int)ident, &ip_hdr(skb)->daddr, dif); 180 (int)ident, &ip_hdr(skb)->daddr, dif);
181 #if IS_ENABLED(CONFIG_IPV6) 181 #if IS_ENABLED(CONFIG_IPV6)
182 } else if (skb->protocol == htons(ETH_P_IPV6)) { 182 } else if (skb->protocol == htons(ETH_P_IPV6)) {
183 pr_debug("try to find: num = %d, daddr = %pI6c, dif = %d\n", 183 pr_debug("try to find: num = %d, daddr = %pI6c, dif = %d\n",
184 (int)ident, &ipv6_hdr(skb)->daddr, dif); 184 (int)ident, &ipv6_hdr(skb)->daddr, dif);
185 #endif 185 #endif
186 } 186 }
187 187
188 read_lock_bh(&ping_table.lock); 188 read_lock_bh(&ping_table.lock);
189 189
190 ping_portaddr_for_each_entry(sk, hnode, hslot) { 190 ping_portaddr_for_each_entry(sk, hnode, hslot) {
191 isk = inet_sk(sk); 191 isk = inet_sk(sk);
192 192
193 pr_debug("iterate\n"); 193 pr_debug("iterate\n");
194 if (isk->inet_num != ident) 194 if (isk->inet_num != ident)
195 continue; 195 continue;
196 196
197 if (skb->protocol == htons(ETH_P_IP) && 197 if (skb->protocol == htons(ETH_P_IP) &&
198 sk->sk_family == AF_INET) { 198 sk->sk_family == AF_INET) {
199 pr_debug("found: %p: num=%d, daddr=%pI4, dif=%d\n", sk, 199 pr_debug("found: %p: num=%d, daddr=%pI4, dif=%d\n", sk,
200 (int) isk->inet_num, &isk->inet_rcv_saddr, 200 (int) isk->inet_num, &isk->inet_rcv_saddr,
201 sk->sk_bound_dev_if); 201 sk->sk_bound_dev_if);
202 202
203 if (isk->inet_rcv_saddr && 203 if (isk->inet_rcv_saddr &&
204 isk->inet_rcv_saddr != ip_hdr(skb)->daddr) 204 isk->inet_rcv_saddr != ip_hdr(skb)->daddr)
205 continue; 205 continue;
206 #if IS_ENABLED(CONFIG_IPV6) 206 #if IS_ENABLED(CONFIG_IPV6)
207 } else if (skb->protocol == htons(ETH_P_IPV6) && 207 } else if (skb->protocol == htons(ETH_P_IPV6) &&
208 sk->sk_family == AF_INET6) { 208 sk->sk_family == AF_INET6) {
209 209
210 pr_debug("found: %p: num=%d, daddr=%pI6c, dif=%d\n", sk, 210 pr_debug("found: %p: num=%d, daddr=%pI6c, dif=%d\n", sk,
211 (int) isk->inet_num, 211 (int) isk->inet_num,
212 &sk->sk_v6_rcv_saddr, 212 &sk->sk_v6_rcv_saddr,
213 sk->sk_bound_dev_if); 213 sk->sk_bound_dev_if);
214 214
215 if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr) && 215 if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr) &&
216 !ipv6_addr_equal(&sk->sk_v6_rcv_saddr, 216 !ipv6_addr_equal(&sk->sk_v6_rcv_saddr,
217 &ipv6_hdr(skb)->daddr)) 217 &ipv6_hdr(skb)->daddr))
218 continue; 218 continue;
219 #endif 219 #endif
220 } else { 220 } else {
221 continue; 221 continue;
222 } 222 }
223 223
224 if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif) 224 if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
225 continue; 225 continue;
226 226
227 sock_hold(sk); 227 sock_hold(sk);
228 goto exit; 228 goto exit;
229 } 229 }
230 230
231 sk = NULL; 231 sk = NULL;
232 exit: 232 exit:
233 read_unlock_bh(&ping_table.lock); 233 read_unlock_bh(&ping_table.lock);
234 234
235 return sk; 235 return sk;
236 } 236 }
237 237
238 static void inet_get_ping_group_range_net(struct net *net, kgid_t *low, 238 static void inet_get_ping_group_range_net(struct net *net, kgid_t *low,
239 kgid_t *high) 239 kgid_t *high)
240 { 240 {
241 kgid_t *data = net->ipv4.ping_group_range.range; 241 kgid_t *data = net->ipv4.ping_group_range.range;
242 unsigned int seq; 242 unsigned int seq;
243 243
244 do { 244 do {
245 seq = read_seqbegin(&net->ipv4.ping_group_range.lock); 245 seq = read_seqbegin(&net->ipv4.ping_group_range.lock);
246 246
247 *low = data[0]; 247 *low = data[0];
248 *high = data[1]; 248 *high = data[1];
249 } while (read_seqretry(&net->ipv4.ping_group_range.lock, seq)); 249 } while (read_seqretry(&net->ipv4.ping_group_range.lock, seq));
250 } 250 }
251 251
252 252
253 int ping_init_sock(struct sock *sk) 253 int ping_init_sock(struct sock *sk)
254 { 254 {
255 struct net *net = sock_net(sk); 255 struct net *net = sock_net(sk);
256 kgid_t group = current_egid(); 256 kgid_t group = current_egid();
257 struct group_info *group_info; 257 struct group_info *group_info;
258 int i, j, count; 258 int i, j, count;
259 kgid_t low, high; 259 kgid_t low, high;
260 int ret = 0; 260 int ret = 0;
261 261
262 inet_get_ping_group_range_net(net, &low, &high); 262 inet_get_ping_group_range_net(net, &low, &high);
263 if (gid_lte(low, group) && gid_lte(group, high)) 263 if (gid_lte(low, group) && gid_lte(group, high))
264 return 0; 264 return 0;
265 265
266 group_info = get_current_groups(); 266 group_info = get_current_groups();
267 count = group_info->ngroups; 267 count = group_info->ngroups;
268 for (i = 0; i < group_info->nblocks; i++) { 268 for (i = 0; i < group_info->nblocks; i++) {
269 int cp_count = min_t(int, NGROUPS_PER_BLOCK, count); 269 int cp_count = min_t(int, NGROUPS_PER_BLOCK, count);
270 for (j = 0; j < cp_count; j++) { 270 for (j = 0; j < cp_count; j++) {
271 kgid_t gid = group_info->blocks[i][j]; 271 kgid_t gid = group_info->blocks[i][j];
272 if (gid_lte(low, gid) && gid_lte(gid, high)) 272 if (gid_lte(low, gid) && gid_lte(gid, high))
273 goto out_release_group; 273 goto out_release_group;
274 } 274 }
275 275
276 count -= cp_count; 276 count -= cp_count;
277 } 277 }
278 278
279 ret = -EACCES; 279 ret = -EACCES;
280 280
281 out_release_group: 281 out_release_group:
282 put_group_info(group_info); 282 put_group_info(group_info);
283 return ret; 283 return ret;
284 } 284 }
285 EXPORT_SYMBOL_GPL(ping_init_sock); 285 EXPORT_SYMBOL_GPL(ping_init_sock);
286 286
287 void ping_close(struct sock *sk, long timeout) 287 void ping_close(struct sock *sk, long timeout)
288 { 288 {
289 pr_debug("ping_close(sk=%p,sk->num=%u)\n", 289 pr_debug("ping_close(sk=%p,sk->num=%u)\n",
290 inet_sk(sk), inet_sk(sk)->inet_num); 290 inet_sk(sk), inet_sk(sk)->inet_num);
291 pr_debug("isk->refcnt = %d\n", sk->sk_refcnt.counter); 291 pr_debug("isk->refcnt = %d\n", sk->sk_refcnt.counter);
292 292
293 sk_common_release(sk); 293 sk_common_release(sk);
294 } 294 }
295 EXPORT_SYMBOL_GPL(ping_close); 295 EXPORT_SYMBOL_GPL(ping_close);
296 296
297 /* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */ 297 /* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
298 static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk, 298 static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
299 struct sockaddr *uaddr, int addr_len) { 299 struct sockaddr *uaddr, int addr_len) {
300 struct net *net = sock_net(sk); 300 struct net *net = sock_net(sk);
301 if (sk->sk_family == AF_INET) { 301 if (sk->sk_family == AF_INET) {
302 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; 302 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
303 int chk_addr_ret; 303 int chk_addr_ret;
304 304
305 if (addr_len < sizeof(*addr)) 305 if (addr_len < sizeof(*addr))
306 return -EINVAL; 306 return -EINVAL;
307 307
308 pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n", 308 pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n",
309 sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port)); 309 sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port));
310 310
311 chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr); 311 chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr);
312 312
313 if (addr->sin_addr.s_addr == htonl(INADDR_ANY)) 313 if (addr->sin_addr.s_addr == htonl(INADDR_ANY))
314 chk_addr_ret = RTN_LOCAL; 314 chk_addr_ret = RTN_LOCAL;
315 315
316 if ((net->ipv4.sysctl_ip_nonlocal_bind == 0 && 316 if ((net->ipv4.sysctl_ip_nonlocal_bind == 0 &&
317 isk->freebind == 0 && isk->transparent == 0 && 317 isk->freebind == 0 && isk->transparent == 0 &&
318 chk_addr_ret != RTN_LOCAL) || 318 chk_addr_ret != RTN_LOCAL) ||
319 chk_addr_ret == RTN_MULTICAST || 319 chk_addr_ret == RTN_MULTICAST ||
320 chk_addr_ret == RTN_BROADCAST) 320 chk_addr_ret == RTN_BROADCAST)
321 return -EADDRNOTAVAIL; 321 return -EADDRNOTAVAIL;
322 322
323 #if IS_ENABLED(CONFIG_IPV6) 323 #if IS_ENABLED(CONFIG_IPV6)
324 } else if (sk->sk_family == AF_INET6) { 324 } else if (sk->sk_family == AF_INET6) {
325 struct sockaddr_in6 *addr = (struct sockaddr_in6 *) uaddr; 325 struct sockaddr_in6 *addr = (struct sockaddr_in6 *) uaddr;
326 int addr_type, scoped, has_addr; 326 int addr_type, scoped, has_addr;
327 struct net_device *dev = NULL; 327 struct net_device *dev = NULL;
328 328
329 if (addr_len < sizeof(*addr)) 329 if (addr_len < sizeof(*addr))
330 return -EINVAL; 330 return -EINVAL;
331 331
332 if (addr->sin6_family != AF_INET6) 332 if (addr->sin6_family != AF_INET6)
333 return -EINVAL; 333 return -EINVAL;
334 334
335 pr_debug("ping_check_bind_addr(sk=%p,addr=%pI6c,port=%d)\n", 335 pr_debug("ping_check_bind_addr(sk=%p,addr=%pI6c,port=%d)\n",
336 sk, addr->sin6_addr.s6_addr, ntohs(addr->sin6_port)); 336 sk, addr->sin6_addr.s6_addr, ntohs(addr->sin6_port));
337 337
338 addr_type = ipv6_addr_type(&addr->sin6_addr); 338 addr_type = ipv6_addr_type(&addr->sin6_addr);
339 scoped = __ipv6_addr_needs_scope_id(addr_type); 339 scoped = __ipv6_addr_needs_scope_id(addr_type);
340 if ((addr_type != IPV6_ADDR_ANY && 340 if ((addr_type != IPV6_ADDR_ANY &&
341 !(addr_type & IPV6_ADDR_UNICAST)) || 341 !(addr_type & IPV6_ADDR_UNICAST)) ||
342 (scoped && !addr->sin6_scope_id)) 342 (scoped && !addr->sin6_scope_id))
343 return -EINVAL; 343 return -EINVAL;
344 344
345 rcu_read_lock(); 345 rcu_read_lock();
346 if (addr->sin6_scope_id) { 346 if (addr->sin6_scope_id) {
347 dev = dev_get_by_index_rcu(net, addr->sin6_scope_id); 347 dev = dev_get_by_index_rcu(net, addr->sin6_scope_id);
348 if (!dev) { 348 if (!dev) {
349 rcu_read_unlock(); 349 rcu_read_unlock();
350 return -ENODEV; 350 return -ENODEV;
351 } 351 }
352 } 352 }
353 has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev, 353 has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
354 scoped); 354 scoped);
355 rcu_read_unlock(); 355 rcu_read_unlock();
356 356
357 if (!(isk->freebind || isk->transparent || has_addr || 357 if (!(isk->freebind || isk->transparent || has_addr ||
358 addr_type == IPV6_ADDR_ANY)) 358 addr_type == IPV6_ADDR_ANY))
359 return -EADDRNOTAVAIL; 359 return -EADDRNOTAVAIL;
360 360
361 if (scoped) 361 if (scoped)
362 sk->sk_bound_dev_if = addr->sin6_scope_id; 362 sk->sk_bound_dev_if = addr->sin6_scope_id;
363 #endif 363 #endif
364 } else { 364 } else {
365 return -EAFNOSUPPORT; 365 return -EAFNOSUPPORT;
366 } 366 }
367 return 0; 367 return 0;
368 } 368 }
369 369
370 static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr) 370 static void ping_set_saddr(struct sock *sk, struct sockaddr *saddr)
371 { 371 {
372 if (saddr->sa_family == AF_INET) { 372 if (saddr->sa_family == AF_INET) {
373 struct inet_sock *isk = inet_sk(sk); 373 struct inet_sock *isk = inet_sk(sk);
374 struct sockaddr_in *addr = (struct sockaddr_in *) saddr; 374 struct sockaddr_in *addr = (struct sockaddr_in *) saddr;
375 isk->inet_rcv_saddr = isk->inet_saddr = addr->sin_addr.s_addr; 375 isk->inet_rcv_saddr = isk->inet_saddr = addr->sin_addr.s_addr;
376 #if IS_ENABLED(CONFIG_IPV6) 376 #if IS_ENABLED(CONFIG_IPV6)
377 } else if (saddr->sa_family == AF_INET6) { 377 } else if (saddr->sa_family == AF_INET6) {
378 struct sockaddr_in6 *addr = (struct sockaddr_in6 *) saddr; 378 struct sockaddr_in6 *addr = (struct sockaddr_in6 *) saddr;
379 struct ipv6_pinfo *np = inet6_sk(sk); 379 struct ipv6_pinfo *np = inet6_sk(sk);
380 sk->sk_v6_rcv_saddr = np->saddr = addr->sin6_addr; 380 sk->sk_v6_rcv_saddr = np->saddr = addr->sin6_addr;
381 #endif 381 #endif
382 } 382 }
383 } 383 }
384 384
385 static void ping_clear_saddr(struct sock *sk, int dif) 385 static void ping_clear_saddr(struct sock *sk, int dif)
386 { 386 {
387 sk->sk_bound_dev_if = dif; 387 sk->sk_bound_dev_if = dif;
388 if (sk->sk_family == AF_INET) { 388 if (sk->sk_family == AF_INET) {
389 struct inet_sock *isk = inet_sk(sk); 389 struct inet_sock *isk = inet_sk(sk);
390 isk->inet_rcv_saddr = isk->inet_saddr = 0; 390 isk->inet_rcv_saddr = isk->inet_saddr = 0;
391 #if IS_ENABLED(CONFIG_IPV6) 391 #if IS_ENABLED(CONFIG_IPV6)
392 } else if (sk->sk_family == AF_INET6) { 392 } else if (sk->sk_family == AF_INET6) {
393 struct ipv6_pinfo *np = inet6_sk(sk); 393 struct ipv6_pinfo *np = inet6_sk(sk);
394 memset(&sk->sk_v6_rcv_saddr, 0, sizeof(sk->sk_v6_rcv_saddr)); 394 memset(&sk->sk_v6_rcv_saddr, 0, sizeof(sk->sk_v6_rcv_saddr));
395 memset(&np->saddr, 0, sizeof(np->saddr)); 395 memset(&np->saddr, 0, sizeof(np->saddr));
396 #endif 396 #endif
397 } 397 }
398 } 398 }
399 /* 399 /*
400 * We need our own bind because there are no privileged id's == local ports. 400 * We need our own bind because there are no privileged id's == local ports.
401 * Moreover, we don't allow binding to multi- and broadcast addresses. 401 * Moreover, we don't allow binding to multi- and broadcast addresses.
402 */ 402 */
403 403
404 int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) 404 int ping_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
405 { 405 {
406 struct inet_sock *isk = inet_sk(sk); 406 struct inet_sock *isk = inet_sk(sk);
407 unsigned short snum; 407 unsigned short snum;
408 int err; 408 int err;
409 int dif = sk->sk_bound_dev_if; 409 int dif = sk->sk_bound_dev_if;
410 410
411 err = ping_check_bind_addr(sk, isk, uaddr, addr_len); 411 err = ping_check_bind_addr(sk, isk, uaddr, addr_len);
412 if (err) 412 if (err)
413 return err; 413 return err;
414 414
415 lock_sock(sk); 415 lock_sock(sk);
416 416
417 err = -EINVAL; 417 err = -EINVAL;
418 if (isk->inet_num != 0) 418 if (isk->inet_num != 0)
419 goto out; 419 goto out;
420 420
421 err = -EADDRINUSE; 421 err = -EADDRINUSE;
422 ping_set_saddr(sk, uaddr); 422 ping_set_saddr(sk, uaddr);
423 snum = ntohs(((struct sockaddr_in *)uaddr)->sin_port); 423 snum = ntohs(((struct sockaddr_in *)uaddr)->sin_port);
424 if (ping_get_port(sk, snum) != 0) { 424 if (ping_get_port(sk, snum) != 0) {
425 ping_clear_saddr(sk, dif); 425 ping_clear_saddr(sk, dif);
426 goto out; 426 goto out;
427 } 427 }
428 428
429 pr_debug("after bind(): num = %d, dif = %d\n", 429 pr_debug("after bind(): num = %d, dif = %d\n",
430 (int)isk->inet_num, 430 (int)isk->inet_num,
431 (int)sk->sk_bound_dev_if); 431 (int)sk->sk_bound_dev_if);
432 432
433 err = 0; 433 err = 0;
434 if (sk->sk_family == AF_INET && isk->inet_rcv_saddr) 434 if (sk->sk_family == AF_INET && isk->inet_rcv_saddr)
435 sk->sk_userlocks |= SOCK_BINDADDR_LOCK; 435 sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
436 #if IS_ENABLED(CONFIG_IPV6) 436 #if IS_ENABLED(CONFIG_IPV6)
437 if (sk->sk_family == AF_INET6 && !ipv6_addr_any(&sk->sk_v6_rcv_saddr)) 437 if (sk->sk_family == AF_INET6 && !ipv6_addr_any(&sk->sk_v6_rcv_saddr))
438 sk->sk_userlocks |= SOCK_BINDADDR_LOCK; 438 sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
439 #endif 439 #endif
440 440
441 if (snum) 441 if (snum)
442 sk->sk_userlocks |= SOCK_BINDPORT_LOCK; 442 sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
443 isk->inet_sport = htons(isk->inet_num); 443 isk->inet_sport = htons(isk->inet_num);
444 isk->inet_daddr = 0; 444 isk->inet_daddr = 0;
445 isk->inet_dport = 0; 445 isk->inet_dport = 0;
446 446
447 #if IS_ENABLED(CONFIG_IPV6) 447 #if IS_ENABLED(CONFIG_IPV6)
448 if (sk->sk_family == AF_INET6) 448 if (sk->sk_family == AF_INET6)
449 memset(&sk->sk_v6_daddr, 0, sizeof(sk->sk_v6_daddr)); 449 memset(&sk->sk_v6_daddr, 0, sizeof(sk->sk_v6_daddr));
450 #endif 450 #endif
451 451
452 sk_dst_reset(sk); 452 sk_dst_reset(sk);
453 out: 453 out:
454 release_sock(sk); 454 release_sock(sk);
455 pr_debug("ping_v4_bind -> %d\n", err); 455 pr_debug("ping_v4_bind -> %d\n", err);
456 return err; 456 return err;
457 } 457 }
458 EXPORT_SYMBOL_GPL(ping_bind); 458 EXPORT_SYMBOL_GPL(ping_bind);
459 459
460 /* 460 /*
461 * Is this a supported type of ICMP message? 461 * Is this a supported type of ICMP message?
462 */ 462 */
463 463
464 static inline int ping_supported(int family, int type, int code) 464 static inline int ping_supported(int family, int type, int code)
465 { 465 {
466 return (family == AF_INET && type == ICMP_ECHO && code == 0) || 466 return (family == AF_INET && type == ICMP_ECHO && code == 0) ||
467 (family == AF_INET6 && type == ICMPV6_ECHO_REQUEST && code == 0); 467 (family == AF_INET6 && type == ICMPV6_ECHO_REQUEST && code == 0);
468 } 468 }
469 469
470 /* 470 /*
471 * This routine is called by the ICMP module when it gets some 471 * This routine is called by the ICMP module when it gets some
472 * sort of error condition. 472 * sort of error condition.
473 */ 473 */
474 474
475 void ping_err(struct sk_buff *skb, int offset, u32 info) 475 void ping_err(struct sk_buff *skb, int offset, u32 info)
476 { 476 {
477 int family; 477 int family;
478 struct icmphdr *icmph; 478 struct icmphdr *icmph;
479 struct inet_sock *inet_sock; 479 struct inet_sock *inet_sock;
480 int type; 480 int type;
481 int code; 481 int code;
482 struct net *net = dev_net(skb->dev); 482 struct net *net = dev_net(skb->dev);
483 struct sock *sk; 483 struct sock *sk;
484 int harderr; 484 int harderr;
485 int err; 485 int err;
486 486
487 if (skb->protocol == htons(ETH_P_IP)) { 487 if (skb->protocol == htons(ETH_P_IP)) {
488 family = AF_INET; 488 family = AF_INET;
489 type = icmp_hdr(skb)->type; 489 type = icmp_hdr(skb)->type;
490 code = icmp_hdr(skb)->code; 490 code = icmp_hdr(skb)->code;
491 icmph = (struct icmphdr *)(skb->data + offset); 491 icmph = (struct icmphdr *)(skb->data + offset);
492 } else if (skb->protocol == htons(ETH_P_IPV6)) { 492 } else if (skb->protocol == htons(ETH_P_IPV6)) {
493 family = AF_INET6; 493 family = AF_INET6;
494 type = icmp6_hdr(skb)->icmp6_type; 494 type = icmp6_hdr(skb)->icmp6_type;
495 code = icmp6_hdr(skb)->icmp6_code; 495 code = icmp6_hdr(skb)->icmp6_code;
496 icmph = (struct icmphdr *) (skb->data + offset); 496 icmph = (struct icmphdr *) (skb->data + offset);
497 } else { 497 } else {
498 BUG(); 498 BUG();
499 } 499 }
500 500
501 /* We assume the packet has already been checked by icmp_unreach */ 501 /* We assume the packet has already been checked by icmp_unreach */
502 502
503 if (!ping_supported(family, icmph->type, icmph->code)) 503 if (!ping_supported(family, icmph->type, icmph->code))
504 return; 504 return;
505 505
506 pr_debug("ping_err(proto=0x%x,type=%d,code=%d,id=%04x,seq=%04x)\n", 506 pr_debug("ping_err(proto=0x%x,type=%d,code=%d,id=%04x,seq=%04x)\n",
507 skb->protocol, type, code, ntohs(icmph->un.echo.id), 507 skb->protocol, type, code, ntohs(icmph->un.echo.id),
508 ntohs(icmph->un.echo.sequence)); 508 ntohs(icmph->un.echo.sequence));
509 509
510 sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id)); 510 sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
511 if (sk == NULL) { 511 if (sk == NULL) {
512 pr_debug("no socket, dropping\n"); 512 pr_debug("no socket, dropping\n");
513 return; /* No socket for error */ 513 return; /* No socket for error */
514 } 514 }
515 pr_debug("err on socket %p\n", sk); 515 pr_debug("err on socket %p\n", sk);
516 516
517 err = 0; 517 err = 0;
518 harderr = 0; 518 harderr = 0;
519 inet_sock = inet_sk(sk); 519 inet_sock = inet_sk(sk);
520 520
521 if (skb->protocol == htons(ETH_P_IP)) { 521 if (skb->protocol == htons(ETH_P_IP)) {
522 switch (type) { 522 switch (type) {
523 default: 523 default:
524 case ICMP_TIME_EXCEEDED: 524 case ICMP_TIME_EXCEEDED:
525 err = EHOSTUNREACH; 525 err = EHOSTUNREACH;
526 break; 526 break;
527 case ICMP_SOURCE_QUENCH: 527 case ICMP_SOURCE_QUENCH:
528 /* This is not a real error but ping wants to see it. 528 /* This is not a real error but ping wants to see it.
529 * Report it with some fake errno. 529 * Report it with some fake errno.
530 */ 530 */
531 err = EREMOTEIO; 531 err = EREMOTEIO;
532 break; 532 break;
533 case ICMP_PARAMETERPROB: 533 case ICMP_PARAMETERPROB:
534 err = EPROTO; 534 err = EPROTO;
535 harderr = 1; 535 harderr = 1;
536 break; 536 break;
537 case ICMP_DEST_UNREACH: 537 case ICMP_DEST_UNREACH:
538 if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */ 538 if (code == ICMP_FRAG_NEEDED) { /* Path MTU discovery */
539 ipv4_sk_update_pmtu(skb, sk, info); 539 ipv4_sk_update_pmtu(skb, sk, info);
540 if (inet_sock->pmtudisc != IP_PMTUDISC_DONT) { 540 if (inet_sock->pmtudisc != IP_PMTUDISC_DONT) {
541 err = EMSGSIZE; 541 err = EMSGSIZE;
542 harderr = 1; 542 harderr = 1;
543 break; 543 break;
544 } 544 }
545 goto out; 545 goto out;
546 } 546 }
547 err = EHOSTUNREACH; 547 err = EHOSTUNREACH;
548 if (code <= NR_ICMP_UNREACH) { 548 if (code <= NR_ICMP_UNREACH) {
549 harderr = icmp_err_convert[code].fatal; 549 harderr = icmp_err_convert[code].fatal;
550 err = icmp_err_convert[code].errno; 550 err = icmp_err_convert[code].errno;
551 } 551 }
552 break; 552 break;
553 case ICMP_REDIRECT: 553 case ICMP_REDIRECT:
554 /* See ICMP_SOURCE_QUENCH */ 554 /* See ICMP_SOURCE_QUENCH */
555 ipv4_sk_redirect(skb, sk); 555 ipv4_sk_redirect(skb, sk);
556 err = EREMOTEIO; 556 err = EREMOTEIO;
557 break; 557 break;
558 } 558 }
559 #if IS_ENABLED(CONFIG_IPV6) 559 #if IS_ENABLED(CONFIG_IPV6)
560 } else if (skb->protocol == htons(ETH_P_IPV6)) { 560 } else if (skb->protocol == htons(ETH_P_IPV6)) {
561 harderr = pingv6_ops.icmpv6_err_convert(type, code, &err); 561 harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
562 #endif 562 #endif
563 } 563 }
564 564
565 /* 565 /*
566 * RFC1122: OK. Passes ICMP errors back to application, as per 566 * RFC1122: OK. Passes ICMP errors back to application, as per
567 * 4.1.3.3. 567 * 4.1.3.3.
568 */ 568 */
569 if ((family == AF_INET && !inet_sock->recverr) || 569 if ((family == AF_INET && !inet_sock->recverr) ||
570 (family == AF_INET6 && !inet6_sk(sk)->recverr)) { 570 (family == AF_INET6 && !inet6_sk(sk)->recverr)) {
571 if (!harderr || sk->sk_state != TCP_ESTABLISHED) 571 if (!harderr || sk->sk_state != TCP_ESTABLISHED)
572 goto out; 572 goto out;
573 } else { 573 } else {
574 if (family == AF_INET) { 574 if (family == AF_INET) {
575 ip_icmp_error(sk, skb, err, 0 /* no remote port */, 575 ip_icmp_error(sk, skb, err, 0 /* no remote port */,
576 info, (u8 *)icmph); 576 info, (u8 *)icmph);
577 #if IS_ENABLED(CONFIG_IPV6) 577 #if IS_ENABLED(CONFIG_IPV6)
578 } else if (family == AF_INET6) { 578 } else if (family == AF_INET6) {
579 pingv6_ops.ipv6_icmp_error(sk, skb, err, 0, 579 pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
580 info, (u8 *)icmph); 580 info, (u8 *)icmph);
581 #endif 581 #endif
582 } 582 }
583 } 583 }
584 sk->sk_err = err; 584 sk->sk_err = err;
585 sk->sk_error_report(sk); 585 sk->sk_error_report(sk);
586 out: 586 out:
587 sock_put(sk); 587 sock_put(sk);
588 } 588 }
589 EXPORT_SYMBOL_GPL(ping_err); 589 EXPORT_SYMBOL_GPL(ping_err);
590 590
591 /* 591 /*
592 * Copy and checksum an ICMP Echo packet from user space into a buffer 592 * Copy and checksum an ICMP Echo packet from user space into a buffer
593 * starting from the payload. 593 * starting from the payload.
594 */ 594 */
595 595
596 int ping_getfrag(void *from, char *to, 596 int ping_getfrag(void *from, char *to,
597 int offset, int fraglen, int odd, struct sk_buff *skb) 597 int offset, int fraglen, int odd, struct sk_buff *skb)
598 { 598 {
599 struct pingfakehdr *pfh = (struct pingfakehdr *)from; 599 struct pingfakehdr *pfh = (struct pingfakehdr *)from;
600 600
601 if (offset == 0) { 601 if (offset == 0) {
602 if (fraglen < sizeof(struct icmphdr)) 602 if (fraglen < sizeof(struct icmphdr))
603 BUG(); 603 BUG();
604 if (csum_partial_copy_fromiovecend(to + sizeof(struct icmphdr), 604 if (csum_partial_copy_fromiovecend(to + sizeof(struct icmphdr),
605 pfh->iov, 0, fraglen - sizeof(struct icmphdr), 605 pfh->iov, 0, fraglen - sizeof(struct icmphdr),
606 &pfh->wcheck)) 606 &pfh->wcheck))
607 return -EFAULT; 607 return -EFAULT;
608 } else if (offset < sizeof(struct icmphdr)) { 608 } else if (offset < sizeof(struct icmphdr)) {
609 BUG(); 609 BUG();
610 } else { 610 } else {
611 if (csum_partial_copy_fromiovecend 611 if (csum_partial_copy_fromiovecend
612 (to, pfh->iov, offset - sizeof(struct icmphdr), 612 (to, pfh->iov, offset - sizeof(struct icmphdr),
613 fraglen, &pfh->wcheck)) 613 fraglen, &pfh->wcheck))
614 return -EFAULT; 614 return -EFAULT;
615 } 615 }
616 616
617 #if IS_ENABLED(CONFIG_IPV6) 617 #if IS_ENABLED(CONFIG_IPV6)
618 /* For IPv6, checksum each skb as we go along, as expected by 618 /* For IPv6, checksum each skb as we go along, as expected by
619 * icmpv6_push_pending_frames. For IPv4, accumulate the checksum in 619 * icmpv6_push_pending_frames. For IPv4, accumulate the checksum in
620 * wcheck, it will be finalized in ping_v4_push_pending_frames. 620 * wcheck, it will be finalized in ping_v4_push_pending_frames.
621 */ 621 */
622 if (pfh->family == AF_INET6) { 622 if (pfh->family == AF_INET6) {
623 skb->csum = pfh->wcheck; 623 skb->csum = pfh->wcheck;
624 skb->ip_summed = CHECKSUM_NONE; 624 skb->ip_summed = CHECKSUM_NONE;
625 pfh->wcheck = 0; 625 pfh->wcheck = 0;
626 } 626 }
627 #endif 627 #endif
628 628
629 return 0; 629 return 0;
630 } 630 }
631 EXPORT_SYMBOL_GPL(ping_getfrag); 631 EXPORT_SYMBOL_GPL(ping_getfrag);
632 632
633 static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh, 633 static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,
634 struct flowi4 *fl4) 634 struct flowi4 *fl4)
635 { 635 {
636 struct sk_buff *skb = skb_peek(&sk->sk_write_queue); 636 struct sk_buff *skb = skb_peek(&sk->sk_write_queue);
637 637
638 pfh->wcheck = csum_partial((char *)&pfh->icmph, 638 pfh->wcheck = csum_partial((char *)&pfh->icmph,
639 sizeof(struct icmphdr), pfh->wcheck); 639 sizeof(struct icmphdr), pfh->wcheck);
640 pfh->icmph.checksum = csum_fold(pfh->wcheck); 640 pfh->icmph.checksum = csum_fold(pfh->wcheck);
641 memcpy(icmp_hdr(skb), &pfh->icmph, sizeof(struct icmphdr)); 641 memcpy(icmp_hdr(skb), &pfh->icmph, sizeof(struct icmphdr));
642 skb->ip_summed = CHECKSUM_NONE; 642 skb->ip_summed = CHECKSUM_NONE;
643 return ip_push_pending_frames(sk, fl4); 643 return ip_push_pending_frames(sk, fl4);
644 } 644 }
645 645
646 int ping_common_sendmsg(int family, struct msghdr *msg, size_t len, 646 int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
647 void *user_icmph, size_t icmph_len) { 647 void *user_icmph, size_t icmph_len) {
648 u8 type, code; 648 u8 type, code;
649 649
650 if (len > 0xFFFF) 650 if (len > 0xFFFF)
651 return -EMSGSIZE; 651 return -EMSGSIZE;
652 652
653 /* 653 /*
654 * Check the flags. 654 * Check the flags.
655 */ 655 */
656 656
657 /* Mirror BSD error message compatibility */ 657 /* Mirror BSD error message compatibility */
658 if (msg->msg_flags & MSG_OOB) 658 if (msg->msg_flags & MSG_OOB)
659 return -EOPNOTSUPP; 659 return -EOPNOTSUPP;
660 660
661 /* 661 /*
662 * Fetch the ICMP header provided by the userland. 662 * Fetch the ICMP header provided by the userland.
663 * iovec is modified! The ICMP header is consumed. 663 * iovec is modified! The ICMP header is consumed.
664 */ 664 */
665 if (memcpy_fromiovec(user_icmph, msg->msg_iov, icmph_len)) 665 if (memcpy_fromiovec(user_icmph, msg->msg_iov, icmph_len))
666 return -EFAULT; 666 return -EFAULT;
667 667
668 if (family == AF_INET) { 668 if (family == AF_INET) {
669 type = ((struct icmphdr *) user_icmph)->type; 669 type = ((struct icmphdr *) user_icmph)->type;
670 code = ((struct icmphdr *) user_icmph)->code; 670 code = ((struct icmphdr *) user_icmph)->code;
671 #if IS_ENABLED(CONFIG_IPV6) 671 #if IS_ENABLED(CONFIG_IPV6)
672 } else if (family == AF_INET6) { 672 } else if (family == AF_INET6) {
673 type = ((struct icmp6hdr *) user_icmph)->icmp6_type; 673 type = ((struct icmp6hdr *) user_icmph)->icmp6_type;
674 code = ((struct icmp6hdr *) user_icmph)->icmp6_code; 674 code = ((struct icmp6hdr *) user_icmph)->icmp6_code;
675 #endif 675 #endif
676 } else { 676 } else {
677 BUG(); 677 BUG();
678 } 678 }
679 679
680 if (!ping_supported(family, type, code)) 680 if (!ping_supported(family, type, code))
681 return -EINVAL; 681 return -EINVAL;
682 682
683 return 0; 683 return 0;
684 } 684 }
685 EXPORT_SYMBOL_GPL(ping_common_sendmsg); 685 EXPORT_SYMBOL_GPL(ping_common_sendmsg);
686 686
687 static int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 687 static int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
688 size_t len) 688 size_t len)
689 { 689 {
690 struct net *net = sock_net(sk); 690 struct net *net = sock_net(sk);
691 struct flowi4 fl4; 691 struct flowi4 fl4;
692 struct inet_sock *inet = inet_sk(sk); 692 struct inet_sock *inet = inet_sk(sk);
693 struct ipcm_cookie ipc; 693 struct ipcm_cookie ipc;
694 struct icmphdr user_icmph; 694 struct icmphdr user_icmph;
695 struct pingfakehdr pfh; 695 struct pingfakehdr pfh;
696 struct rtable *rt = NULL; 696 struct rtable *rt = NULL;
697 struct ip_options_data opt_copy; 697 struct ip_options_data opt_copy;
698 int free = 0; 698 int free = 0;
699 __be32 saddr, daddr, faddr; 699 __be32 saddr, daddr, faddr;
700 u8 tos; 700 u8 tos;
701 int err; 701 int err;
702 702
703 pr_debug("ping_v4_sendmsg(sk=%p,sk->num=%u)\n", inet, inet->inet_num); 703 pr_debug("ping_v4_sendmsg(sk=%p,sk->num=%u)\n", inet, inet->inet_num);
704 704
705 err = ping_common_sendmsg(AF_INET, msg, len, &user_icmph, 705 err = ping_common_sendmsg(AF_INET, msg, len, &user_icmph,
706 sizeof(user_icmph)); 706 sizeof(user_icmph));
707 if (err) 707 if (err)
708 return err; 708 return err;
709 709
710 /* 710 /*
711 * Get and verify the address. 711 * Get and verify the address.
712 */ 712 */
713 713
714 if (msg->msg_name) { 714 if (msg->msg_name) {
715 DECLARE_SOCKADDR(struct sockaddr_in *, usin, msg->msg_name); 715 DECLARE_SOCKADDR(struct sockaddr_in *, usin, msg->msg_name);
716 if (msg->msg_namelen < sizeof(*usin)) 716 if (msg->msg_namelen < sizeof(*usin))
717 return -EINVAL; 717 return -EINVAL;
718 if (usin->sin_family != AF_INET) 718 if (usin->sin_family != AF_INET)
719 return -EINVAL; 719 return -EINVAL;
720 daddr = usin->sin_addr.s_addr; 720 daddr = usin->sin_addr.s_addr;
721 /* no remote port */ 721 /* no remote port */
722 } else { 722 } else {
723 if (sk->sk_state != TCP_ESTABLISHED) 723 if (sk->sk_state != TCP_ESTABLISHED)
724 return -EDESTADDRREQ; 724 return -EDESTADDRREQ;
725 daddr = inet->inet_daddr; 725 daddr = inet->inet_daddr;
726 /* no remote port */ 726 /* no remote port */
727 } 727 }
728 728
729 ipc.addr = inet->inet_saddr; 729 ipc.addr = inet->inet_saddr;
730 ipc.opt = NULL; 730 ipc.opt = NULL;
731 ipc.oif = sk->sk_bound_dev_if; 731 ipc.oif = sk->sk_bound_dev_if;
732 ipc.tx_flags = 0; 732 ipc.tx_flags = 0;
733 ipc.ttl = 0; 733 ipc.ttl = 0;
734 ipc.tos = -1; 734 ipc.tos = -1;
735 735
736 sock_tx_timestamp(sk, &ipc.tx_flags); 736 sock_tx_timestamp(sk, &ipc.tx_flags);
737 737
738 if (msg->msg_controllen) { 738 if (msg->msg_controllen) {
739 err = ip_cmsg_send(sock_net(sk), msg, &ipc, false); 739 err = ip_cmsg_send(sock_net(sk), msg, &ipc, false);
740 if (err) 740 if (err)
741 return err; 741 return err;
742 if (ipc.opt) 742 if (ipc.opt)
743 free = 1; 743 free = 1;
744 } 744 }
745 if (!ipc.opt) { 745 if (!ipc.opt) {
746 struct ip_options_rcu *inet_opt; 746 struct ip_options_rcu *inet_opt;
747 747
748 rcu_read_lock(); 748 rcu_read_lock();
749 inet_opt = rcu_dereference(inet->inet_opt); 749 inet_opt = rcu_dereference(inet->inet_opt);
750 if (inet_opt) { 750 if (inet_opt) {
751 memcpy(&opt_copy, inet_opt, 751 memcpy(&opt_copy, inet_opt,
752 sizeof(*inet_opt) + inet_opt->opt.optlen); 752 sizeof(*inet_opt) + inet_opt->opt.optlen);
753 ipc.opt = &opt_copy.opt; 753 ipc.opt = &opt_copy.opt;
754 } 754 }
755 rcu_read_unlock(); 755 rcu_read_unlock();
756 } 756 }
757 757
758 saddr = ipc.addr; 758 saddr = ipc.addr;
759 ipc.addr = faddr = daddr; 759 ipc.addr = faddr = daddr;
760 760
761 if (ipc.opt && ipc.opt->opt.srr) { 761 if (ipc.opt && ipc.opt->opt.srr) {
762 if (!daddr) 762 if (!daddr)
763 return -EINVAL; 763 return -EINVAL;
764 faddr = ipc.opt->opt.faddr; 764 faddr = ipc.opt->opt.faddr;
765 } 765 }
766 tos = get_rttos(&ipc, inet); 766 tos = get_rttos(&ipc, inet);
767 if (sock_flag(sk, SOCK_LOCALROUTE) || 767 if (sock_flag(sk, SOCK_LOCALROUTE) ||
768 (msg->msg_flags & MSG_DONTROUTE) || 768 (msg->msg_flags & MSG_DONTROUTE) ||
769 (ipc.opt && ipc.opt->opt.is_strictroute)) { 769 (ipc.opt && ipc.opt->opt.is_strictroute)) {
770 tos |= RTO_ONLINK; 770 tos |= RTO_ONLINK;
771 } 771 }
772 772
773 if (ipv4_is_multicast(daddr)) { 773 if (ipv4_is_multicast(daddr)) {
774 if (!ipc.oif) 774 if (!ipc.oif)
775 ipc.oif = inet->mc_index; 775 ipc.oif = inet->mc_index;
776 if (!saddr) 776 if (!saddr)
777 saddr = inet->mc_addr; 777 saddr = inet->mc_addr;
778 } else if (!ipc.oif) 778 } else if (!ipc.oif)
779 ipc.oif = inet->uc_index; 779 ipc.oif = inet->uc_index;
780 780
781 flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, 781 flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
782 RT_SCOPE_UNIVERSE, sk->sk_protocol, 782 RT_SCOPE_UNIVERSE, sk->sk_protocol,
783 inet_sk_flowi_flags(sk), faddr, saddr, 0, 0); 783 inet_sk_flowi_flags(sk), faddr, saddr, 0, 0);
784 784
785 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); 785 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
786 rt = ip_route_output_flow(net, &fl4, sk); 786 rt = ip_route_output_flow(net, &fl4, sk);
787 if (IS_ERR(rt)) { 787 if (IS_ERR(rt)) {
788 err = PTR_ERR(rt); 788 err = PTR_ERR(rt);
789 rt = NULL; 789 rt = NULL;
790 if (err == -ENETUNREACH) 790 if (err == -ENETUNREACH)
791 IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES); 791 IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
792 goto out; 792 goto out;
793 } 793 }
794 794
795 err = -EACCES; 795 err = -EACCES;
796 if ((rt->rt_flags & RTCF_BROADCAST) && 796 if ((rt->rt_flags & RTCF_BROADCAST) &&
797 !sock_flag(sk, SOCK_BROADCAST)) 797 !sock_flag(sk, SOCK_BROADCAST))
798 goto out; 798 goto out;
799 799
800 if (msg->msg_flags & MSG_CONFIRM) 800 if (msg->msg_flags & MSG_CONFIRM)
801 goto do_confirm; 801 goto do_confirm;
802 back_from_confirm: 802 back_from_confirm:
803 803
804 if (!ipc.addr) 804 if (!ipc.addr)
805 ipc.addr = fl4.daddr; 805 ipc.addr = fl4.daddr;
806 806
807 lock_sock(sk); 807 lock_sock(sk);
808 808
809 pfh.icmph.type = user_icmph.type; /* already checked */ 809 pfh.icmph.type = user_icmph.type; /* already checked */
810 pfh.icmph.code = user_icmph.code; /* ditto */ 810 pfh.icmph.code = user_icmph.code; /* ditto */
811 pfh.icmph.checksum = 0; 811 pfh.icmph.checksum = 0;
812 pfh.icmph.un.echo.id = inet->inet_sport; 812 pfh.icmph.un.echo.id = inet->inet_sport;
813 pfh.icmph.un.echo.sequence = user_icmph.un.echo.sequence; 813 pfh.icmph.un.echo.sequence = user_icmph.un.echo.sequence;
814 pfh.iov = msg->msg_iov; 814 pfh.iov = msg->msg_iov;
815 pfh.wcheck = 0; 815 pfh.wcheck = 0;
816 pfh.family = AF_INET; 816 pfh.family = AF_INET;
817 817
818 err = ip_append_data(sk, &fl4, ping_getfrag, &pfh, len, 818 err = ip_append_data(sk, &fl4, ping_getfrag, &pfh, len,
819 0, &ipc, &rt, msg->msg_flags); 819 0, &ipc, &rt, msg->msg_flags);
820 if (err) 820 if (err)
821 ip_flush_pending_frames(sk); 821 ip_flush_pending_frames(sk);
822 else 822 else
823 err = ping_v4_push_pending_frames(sk, &pfh, &fl4); 823 err = ping_v4_push_pending_frames(sk, &pfh, &fl4);
824 release_sock(sk); 824 release_sock(sk);
825 825
826 out: 826 out:
827 ip_rt_put(rt); 827 ip_rt_put(rt);
828 if (free) 828 if (free)
829 kfree(ipc.opt); 829 kfree(ipc.opt);
830 if (!err) { 830 if (!err) {
831 icmp_out_count(sock_net(sk), user_icmph.type); 831 icmp_out_count(sock_net(sk), user_icmph.type);
832 return len; 832 return len;
833 } 833 }
834 return err; 834 return err;
835 835
836 do_confirm: 836 do_confirm:
837 dst_confirm(&rt->dst); 837 dst_confirm(&rt->dst);
838 if (!(msg->msg_flags & MSG_PROBE) || len) 838 if (!(msg->msg_flags & MSG_PROBE) || len)
839 goto back_from_confirm; 839 goto back_from_confirm;
840 err = 0; 840 err = 0;
841 goto out; 841 goto out;
842 } 842 }
843 843
844 int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 844 int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
845 size_t len, int noblock, int flags, int *addr_len) 845 size_t len, int noblock, int flags, int *addr_len)
846 { 846 {
847 struct inet_sock *isk = inet_sk(sk); 847 struct inet_sock *isk = inet_sk(sk);
848 int family = sk->sk_family; 848 int family = sk->sk_family;
849 struct sk_buff *skb; 849 struct sk_buff *skb;
850 int copied, err; 850 int copied, err;
851 851
852 pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num); 852 pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num);
853 853
854 err = -EOPNOTSUPP; 854 err = -EOPNOTSUPP;
855 if (flags & MSG_OOB) 855 if (flags & MSG_OOB)
856 goto out; 856 goto out;
857 857
858 if (flags & MSG_ERRQUEUE) 858 if (flags & MSG_ERRQUEUE)
859 return inet_recv_error(sk, msg, len, addr_len); 859 return inet_recv_error(sk, msg, len, addr_len);
860 860
861 skb = skb_recv_datagram(sk, flags, noblock, &err); 861 skb = skb_recv_datagram(sk, flags, noblock, &err);
862 if (!skb) 862 if (!skb)
863 goto out; 863 goto out;
864 864
865 copied = skb->len; 865 copied = skb->len;
866 if (copied > len) { 866 if (copied > len) {
867 msg->msg_flags |= MSG_TRUNC; 867 msg->msg_flags |= MSG_TRUNC;
868 copied = len; 868 copied = len;
869 } 869 }
870 870
871 /* Don't bother checking the checksum */ 871 /* Don't bother checking the checksum */
872 err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); 872 err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
873 if (err) 873 if (err)
874 goto done; 874 goto done;
875 875
876 sock_recv_timestamp(msg, sk, skb); 876 sock_recv_timestamp(msg, sk, skb);
877 877
878 /* Copy the address and add cmsg data. */ 878 /* Copy the address and add cmsg data. */
879 if (family == AF_INET) { 879 if (family == AF_INET) {
880 DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg->msg_name); 880 DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg->msg_name);
881 881
882 if (sin) { 882 if (sin) {
883 sin->sin_family = AF_INET; 883 sin->sin_family = AF_INET;
884 sin->sin_port = 0 /* skb->h.uh->source */; 884 sin->sin_port = 0 /* skb->h.uh->source */;
885 sin->sin_addr.s_addr = ip_hdr(skb)->saddr; 885 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
886 memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); 886 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
887 *addr_len = sizeof(*sin); 887 *addr_len = sizeof(*sin);
888 } 888 }
889 889
890 if (isk->cmsg_flags) 890 if (isk->cmsg_flags)
891 ip_cmsg_recv(msg, skb); 891 ip_cmsg_recv(msg, skb);
892 892
893 #if IS_ENABLED(CONFIG_IPV6) 893 #if IS_ENABLED(CONFIG_IPV6)
894 } else if (family == AF_INET6) { 894 } else if (family == AF_INET6) {
895 struct ipv6_pinfo *np = inet6_sk(sk); 895 struct ipv6_pinfo *np = inet6_sk(sk);
896 struct ipv6hdr *ip6 = ipv6_hdr(skb); 896 struct ipv6hdr *ip6 = ipv6_hdr(skb);
897 DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name); 897 DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name);
898 898
899 if (sin6) { 899 if (sin6) {
900 sin6->sin6_family = AF_INET6; 900 sin6->sin6_family = AF_INET6;
901 sin6->sin6_port = 0; 901 sin6->sin6_port = 0;
902 sin6->sin6_addr = ip6->saddr; 902 sin6->sin6_addr = ip6->saddr;
903 sin6->sin6_flowinfo = 0; 903 sin6->sin6_flowinfo = 0;
904 if (np->sndflow) 904 if (np->sndflow)
905 sin6->sin6_flowinfo = ip6_flowinfo(ip6); 905 sin6->sin6_flowinfo = ip6_flowinfo(ip6);
906 sin6->sin6_scope_id = 906 sin6->sin6_scope_id =
907 ipv6_iface_scope_id(&sin6->sin6_addr, 907 ipv6_iface_scope_id(&sin6->sin6_addr,
908 inet6_iif(skb)); 908 inet6_iif(skb));
909 *addr_len = sizeof(*sin6); 909 *addr_len = sizeof(*sin6);
910 } 910 }
911 911
912 if (inet6_sk(sk)->rxopt.all) 912 if (inet6_sk(sk)->rxopt.all)
913 pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb); 913 pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
914 if (skb->protocol == htons(ETH_P_IPV6) && 914 if (skb->protocol == htons(ETH_P_IPV6) &&
915 inet6_sk(sk)->rxopt.all) 915 inet6_sk(sk)->rxopt.all)
916 pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb); 916 pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
917 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags) 917 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
918 ip_cmsg_recv(msg, skb); 918 ip_cmsg_recv(msg, skb);
919 #endif 919 #endif
920 } else { 920 } else {
921 BUG(); 921 BUG();
922 } 922 }
923 923
924 err = copied; 924 err = copied;
925 925
926 done: 926 done:
927 skb_free_datagram(sk, skb); 927 skb_free_datagram(sk, skb);
928 out: 928 out:
929 pr_debug("ping_recvmsg -> %d\n", err); 929 pr_debug("ping_recvmsg -> %d\n", err);
930 return err; 930 return err;
931 } 931 }
932 EXPORT_SYMBOL_GPL(ping_recvmsg); 932 EXPORT_SYMBOL_GPL(ping_recvmsg);
933 933
934 int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 934 int ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
935 { 935 {
936 pr_debug("ping_queue_rcv_skb(sk=%p,sk->num=%d,skb=%p)\n", 936 pr_debug("ping_queue_rcv_skb(sk=%p,sk->num=%d,skb=%p)\n",
937 inet_sk(sk), inet_sk(sk)->inet_num, skb); 937 inet_sk(sk), inet_sk(sk)->inet_num, skb);
938 if (sock_queue_rcv_skb(sk, skb) < 0) { 938 if (sock_queue_rcv_skb(sk, skb) < 0) {
939 kfree_skb(skb); 939 kfree_skb(skb);
940 pr_debug("ping_queue_rcv_skb -> failed\n"); 940 pr_debug("ping_queue_rcv_skb -> failed\n");
941 return -1; 941 return -1;
942 } 942 }
943 return 0; 943 return 0;
944 } 944 }
945 EXPORT_SYMBOL_GPL(ping_queue_rcv_skb); 945 EXPORT_SYMBOL_GPL(ping_queue_rcv_skb);
946 946
947 947
948 /* 948 /*
949 * All we need to do is get the socket. 949 * All we need to do is get the socket.
950 */ 950 */
951 951
952 void ping_rcv(struct sk_buff *skb) 952 void ping_rcv(struct sk_buff *skb)
953 { 953 {
954 struct sock *sk; 954 struct sock *sk;
955 struct net *net = dev_net(skb->dev); 955 struct net *net = dev_net(skb->dev);
956 struct icmphdr *icmph = icmp_hdr(skb); 956 struct icmphdr *icmph = icmp_hdr(skb);
957 957
958 /* We assume the packet has already been checked by icmp_rcv */ 958 /* We assume the packet has already been checked by icmp_rcv */
959 959
960 pr_debug("ping_rcv(skb=%p,id=%04x,seq=%04x)\n", 960 pr_debug("ping_rcv(skb=%p,id=%04x,seq=%04x)\n",
961 skb, ntohs(icmph->un.echo.id), ntohs(icmph->un.echo.sequence)); 961 skb, ntohs(icmph->un.echo.id), ntohs(icmph->un.echo.sequence));
962 962
963 /* Push ICMP header back */ 963 /* Push ICMP header back */
964 skb_push(skb, skb->data - (u8 *)icmph); 964 skb_push(skb, skb->data - (u8 *)icmph);
965 965
966 sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id)); 966 sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
967 if (sk != NULL) { 967 if (sk != NULL) {
968 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
969
968 pr_debug("rcv on socket %p\n", sk); 970 pr_debug("rcv on socket %p\n", sk);
969 ping_queue_rcv_skb(sk, skb_get(skb)); 971 if (skb2)
972 ping_queue_rcv_skb(sk, skb2);
970 sock_put(sk); 973 sock_put(sk);
971 return; 974 return;
972 } 975 }
973 pr_debug("no socket, dropping\n"); 976 pr_debug("no socket, dropping\n");
974 977
975 /* We're called from icmp_rcv(). kfree_skb() is done there. */ 978 /* We're called from icmp_rcv(). kfree_skb() is done there. */
976 } 979 }
977 EXPORT_SYMBOL_GPL(ping_rcv); 980 EXPORT_SYMBOL_GPL(ping_rcv);
978 981
979 struct proto ping_prot = { 982 struct proto ping_prot = {
980 .name = "PING", 983 .name = "PING",
981 .owner = THIS_MODULE, 984 .owner = THIS_MODULE,
982 .init = ping_init_sock, 985 .init = ping_init_sock,
983 .close = ping_close, 986 .close = ping_close,
984 .connect = ip4_datagram_connect, 987 .connect = ip4_datagram_connect,
985 .disconnect = udp_disconnect, 988 .disconnect = udp_disconnect,
986 .setsockopt = ip_setsockopt, 989 .setsockopt = ip_setsockopt,
987 .getsockopt = ip_getsockopt, 990 .getsockopt = ip_getsockopt,
988 .sendmsg = ping_v4_sendmsg, 991 .sendmsg = ping_v4_sendmsg,
989 .recvmsg = ping_recvmsg, 992 .recvmsg = ping_recvmsg,
990 .bind = ping_bind, 993 .bind = ping_bind,
991 .backlog_rcv = ping_queue_rcv_skb, 994 .backlog_rcv = ping_queue_rcv_skb,
992 .release_cb = ip4_datagram_release_cb, 995 .release_cb = ip4_datagram_release_cb,
993 .hash = ping_hash, 996 .hash = ping_hash,
994 .unhash = ping_unhash, 997 .unhash = ping_unhash,
995 .get_port = ping_get_port, 998 .get_port = ping_get_port,
996 .obj_size = sizeof(struct inet_sock), 999 .obj_size = sizeof(struct inet_sock),
997 }; 1000 };
998 EXPORT_SYMBOL(ping_prot); 1001 EXPORT_SYMBOL(ping_prot);
999 1002
1000 #ifdef CONFIG_PROC_FS 1003 #ifdef CONFIG_PROC_FS
1001 1004
1002 static struct sock *ping_get_first(struct seq_file *seq, int start) 1005 static struct sock *ping_get_first(struct seq_file *seq, int start)
1003 { 1006 {
1004 struct sock *sk; 1007 struct sock *sk;
1005 struct ping_iter_state *state = seq->private; 1008 struct ping_iter_state *state = seq->private;
1006 struct net *net = seq_file_net(seq); 1009 struct net *net = seq_file_net(seq);
1007 1010
1008 for (state->bucket = start; state->bucket < PING_HTABLE_SIZE; 1011 for (state->bucket = start; state->bucket < PING_HTABLE_SIZE;
1009 ++state->bucket) { 1012 ++state->bucket) {
1010 struct hlist_nulls_node *node; 1013 struct hlist_nulls_node *node;
1011 struct hlist_nulls_head *hslot; 1014 struct hlist_nulls_head *hslot;
1012 1015
1013 hslot = &ping_table.hash[state->bucket]; 1016 hslot = &ping_table.hash[state->bucket];
1014 1017
1015 if (hlist_nulls_empty(hslot)) 1018 if (hlist_nulls_empty(hslot))
1016 continue; 1019 continue;
1017 1020
1018 sk_nulls_for_each(sk, node, hslot) { 1021 sk_nulls_for_each(sk, node, hslot) {
1019 if (net_eq(sock_net(sk), net) && 1022 if (net_eq(sock_net(sk), net) &&
1020 sk->sk_family == state->family) 1023 sk->sk_family == state->family)
1021 goto found; 1024 goto found;
1022 } 1025 }
1023 } 1026 }
1024 sk = NULL; 1027 sk = NULL;
1025 found: 1028 found:
1026 return sk; 1029 return sk;
1027 } 1030 }
1028 1031
1029 static struct sock *ping_get_next(struct seq_file *seq, struct sock *sk) 1032 static struct sock *ping_get_next(struct seq_file *seq, struct sock *sk)
1030 { 1033 {
1031 struct ping_iter_state *state = seq->private; 1034 struct ping_iter_state *state = seq->private;
1032 struct net *net = seq_file_net(seq); 1035 struct net *net = seq_file_net(seq);
1033 1036
1034 do { 1037 do {
1035 sk = sk_nulls_next(sk); 1038 sk = sk_nulls_next(sk);
1036 } while (sk && (!net_eq(sock_net(sk), net))); 1039 } while (sk && (!net_eq(sock_net(sk), net)));
1037 1040
1038 if (!sk) 1041 if (!sk)
1039 return ping_get_first(seq, state->bucket + 1); 1042 return ping_get_first(seq, state->bucket + 1);
1040 return sk; 1043 return sk;
1041 } 1044 }
1042 1045
1043 static struct sock *ping_get_idx(struct seq_file *seq, loff_t pos) 1046 static struct sock *ping_get_idx(struct seq_file *seq, loff_t pos)
1044 { 1047 {
1045 struct sock *sk = ping_get_first(seq, 0); 1048 struct sock *sk = ping_get_first(seq, 0);
1046 1049
1047 if (sk) 1050 if (sk)
1048 while (pos && (sk = ping_get_next(seq, sk)) != NULL) 1051 while (pos && (sk = ping_get_next(seq, sk)) != NULL)
1049 --pos; 1052 --pos;
1050 return pos ? NULL : sk; 1053 return pos ? NULL : sk;
1051 } 1054 }
1052 1055
1053 void *ping_seq_start(struct seq_file *seq, loff_t *pos, sa_family_t family) 1056 void *ping_seq_start(struct seq_file *seq, loff_t *pos, sa_family_t family)
1054 { 1057 {
1055 struct ping_iter_state *state = seq->private; 1058 struct ping_iter_state *state = seq->private;
1056 state->bucket = 0; 1059 state->bucket = 0;
1057 state->family = family; 1060 state->family = family;
1058 1061
1059 read_lock_bh(&ping_table.lock); 1062 read_lock_bh(&ping_table.lock);
1060 1063
1061 return *pos ? ping_get_idx(seq, *pos-1) : SEQ_START_TOKEN; 1064 return *pos ? ping_get_idx(seq, *pos-1) : SEQ_START_TOKEN;
1062 } 1065 }
1063 EXPORT_SYMBOL_GPL(ping_seq_start); 1066 EXPORT_SYMBOL_GPL(ping_seq_start);
1064 1067
1065 static void *ping_v4_seq_start(struct seq_file *seq, loff_t *pos) 1068 static void *ping_v4_seq_start(struct seq_file *seq, loff_t *pos)
1066 { 1069 {
1067 return ping_seq_start(seq, pos, AF_INET); 1070 return ping_seq_start(seq, pos, AF_INET);
1068 } 1071 }
1069 1072
1070 void *ping_seq_next(struct seq_file *seq, void *v, loff_t *pos) 1073 void *ping_seq_next(struct seq_file *seq, void *v, loff_t *pos)
1071 { 1074 {
1072 struct sock *sk; 1075 struct sock *sk;
1073 1076
1074 if (v == SEQ_START_TOKEN) 1077 if (v == SEQ_START_TOKEN)
1075 sk = ping_get_idx(seq, 0); 1078 sk = ping_get_idx(seq, 0);
1076 else 1079 else
1077 sk = ping_get_next(seq, v); 1080 sk = ping_get_next(seq, v);
1078 1081
1079 ++*pos; 1082 ++*pos;
1080 return sk; 1083 return sk;
1081 } 1084 }
1082 EXPORT_SYMBOL_GPL(ping_seq_next); 1085 EXPORT_SYMBOL_GPL(ping_seq_next);
1083 1086
1084 void ping_seq_stop(struct seq_file *seq, void *v) 1087 void ping_seq_stop(struct seq_file *seq, void *v)
1085 { 1088 {
1086 read_unlock_bh(&ping_table.lock); 1089 read_unlock_bh(&ping_table.lock);
1087 } 1090 }
1088 EXPORT_SYMBOL_GPL(ping_seq_stop); 1091 EXPORT_SYMBOL_GPL(ping_seq_stop);
1089 1092
1090 static void ping_v4_format_sock(struct sock *sp, struct seq_file *f, 1093 static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
1091 int bucket) 1094 int bucket)
1092 { 1095 {
1093 struct inet_sock *inet = inet_sk(sp); 1096 struct inet_sock *inet = inet_sk(sp);
1094 __be32 dest = inet->inet_daddr; 1097 __be32 dest = inet->inet_daddr;
1095 __be32 src = inet->inet_rcv_saddr; 1098 __be32 src = inet->inet_rcv_saddr;
1096 __u16 destp = ntohs(inet->inet_dport); 1099 __u16 destp = ntohs(inet->inet_dport);
1097 __u16 srcp = ntohs(inet->inet_sport); 1100 __u16 srcp = ntohs(inet->inet_sport);
1098 1101
1099 seq_printf(f, "%5d: %08X:%04X %08X:%04X" 1102 seq_printf(f, "%5d: %08X:%04X %08X:%04X"
1100 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d", 1103 " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d",
1101 bucket, src, srcp, dest, destp, sp->sk_state, 1104 bucket, src, srcp, dest, destp, sp->sk_state,
1102 sk_wmem_alloc_get(sp), 1105 sk_wmem_alloc_get(sp),
1103 sk_rmem_alloc_get(sp), 1106 sk_rmem_alloc_get(sp),
1104 0, 0L, 0, 1107 0, 0L, 0,
1105 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)), 1108 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
1106 0, sock_i_ino(sp), 1109 0, sock_i_ino(sp),
1107 atomic_read(&sp->sk_refcnt), sp, 1110 atomic_read(&sp->sk_refcnt), sp,
1108 atomic_read(&sp->sk_drops)); 1111 atomic_read(&sp->sk_drops));
1109 } 1112 }
1110 1113
1111 static int ping_v4_seq_show(struct seq_file *seq, void *v) 1114 static int ping_v4_seq_show(struct seq_file *seq, void *v)
1112 { 1115 {
1113 seq_setwidth(seq, 127); 1116 seq_setwidth(seq, 127);
1114 if (v == SEQ_START_TOKEN) 1117 if (v == SEQ_START_TOKEN)
1115 seq_puts(seq, " sl local_address rem_address st tx_queue " 1118 seq_puts(seq, " sl local_address rem_address st tx_queue "
1116 "rx_queue tr tm->when retrnsmt uid timeout " 1119 "rx_queue tr tm->when retrnsmt uid timeout "
1117 "inode ref pointer drops"); 1120 "inode ref pointer drops");
1118 else { 1121 else {
1119 struct ping_iter_state *state = seq->private; 1122 struct ping_iter_state *state = seq->private;
1120 1123
1121 ping_v4_format_sock(v, seq, state->bucket); 1124 ping_v4_format_sock(v, seq, state->bucket);
1122 } 1125 }
1123 seq_pad(seq, '\n'); 1126 seq_pad(seq, '\n');
1124 return 0; 1127 return 0;
1125 } 1128 }
1126 1129
1127 static const struct seq_operations ping_v4_seq_ops = { 1130 static const struct seq_operations ping_v4_seq_ops = {
1128 .show = ping_v4_seq_show, 1131 .show = ping_v4_seq_show,
1129 .start = ping_v4_seq_start, 1132 .start = ping_v4_seq_start,
1130 .next = ping_seq_next, 1133 .next = ping_seq_next,
1131 .stop = ping_seq_stop, 1134 .stop = ping_seq_stop,
1132 }; 1135 };
1133 1136
1134 static int ping_seq_open(struct inode *inode, struct file *file) 1137 static int ping_seq_open(struct inode *inode, struct file *file)
1135 { 1138 {
1136 struct ping_seq_afinfo *afinfo = PDE_DATA(inode); 1139 struct ping_seq_afinfo *afinfo = PDE_DATA(inode);
1137 return seq_open_net(inode, file, &afinfo->seq_ops, 1140 return seq_open_net(inode, file, &afinfo->seq_ops,
1138 sizeof(struct ping_iter_state)); 1141 sizeof(struct ping_iter_state));
1139 } 1142 }
1140 1143
1141 const struct file_operations ping_seq_fops = { 1144 const struct file_operations ping_seq_fops = {
1142 .open = ping_seq_open, 1145 .open = ping_seq_open,
1143 .read = seq_read, 1146 .read = seq_read,
1144 .llseek = seq_lseek, 1147 .llseek = seq_lseek,
1145 .release = seq_release_net, 1148 .release = seq_release_net,
1146 }; 1149 };
1147 EXPORT_SYMBOL_GPL(ping_seq_fops); 1150 EXPORT_SYMBOL_GPL(ping_seq_fops);
1148 1151
1149 static struct ping_seq_afinfo ping_v4_seq_afinfo = { 1152 static struct ping_seq_afinfo ping_v4_seq_afinfo = {
1150 .name = "icmp", 1153 .name = "icmp",
1151 .family = AF_INET, 1154 .family = AF_INET,
1152 .seq_fops = &ping_seq_fops, 1155 .seq_fops = &ping_seq_fops,
1153 .seq_ops = { 1156 .seq_ops = {
1154 .start = ping_v4_seq_start, 1157 .start = ping_v4_seq_start,
1155 .show = ping_v4_seq_show, 1158 .show = ping_v4_seq_show,
1156 .next = ping_seq_next, 1159 .next = ping_seq_next,
1157 .stop = ping_seq_stop, 1160 .stop = ping_seq_stop,
1158 }, 1161 },
1159 }; 1162 };
1160 1163
1161 int ping_proc_register(struct net *net, struct ping_seq_afinfo *afinfo) 1164 int ping_proc_register(struct net *net, struct ping_seq_afinfo *afinfo)
1162 { 1165 {
1163 struct proc_dir_entry *p; 1166 struct proc_dir_entry *p;
1164 p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net, 1167 p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
1165 afinfo->seq_fops, afinfo); 1168 afinfo->seq_fops, afinfo);
1166 if (!p) 1169 if (!p)
1167 return -ENOMEM; 1170 return -ENOMEM;
1168 return 0; 1171 return 0;
1169 } 1172 }
1170 EXPORT_SYMBOL_GPL(ping_proc_register); 1173 EXPORT_SYMBOL_GPL(ping_proc_register);
1171 1174
1172 void ping_proc_unregister(struct net *net, struct ping_seq_afinfo *afinfo) 1175 void ping_proc_unregister(struct net *net, struct ping_seq_afinfo *afinfo)
1173 { 1176 {
1174 remove_proc_entry(afinfo->name, net->proc_net); 1177 remove_proc_entry(afinfo->name, net->proc_net);
1175 } 1178 }
1176 EXPORT_SYMBOL_GPL(ping_proc_unregister); 1179 EXPORT_SYMBOL_GPL(ping_proc_unregister);
1177 1180
1178 static int __net_init ping_v4_proc_init_net(struct net *net) 1181 static int __net_init ping_v4_proc_init_net(struct net *net)
1179 { 1182 {
1180 return ping_proc_register(net, &ping_v4_seq_afinfo); 1183 return ping_proc_register(net, &ping_v4_seq_afinfo);
1181 } 1184 }
1182 1185
1183 static void __net_exit ping_v4_proc_exit_net(struct net *net) 1186 static void __net_exit ping_v4_proc_exit_net(struct net *net)
1184 { 1187 {
1185 ping_proc_unregister(net, &ping_v4_seq_afinfo); 1188 ping_proc_unregister(net, &ping_v4_seq_afinfo);
1186 } 1189 }
1187 1190
1188 static struct pernet_operations ping_v4_net_ops = { 1191 static struct pernet_operations ping_v4_net_ops = {
1189 .init = ping_v4_proc_init_net, 1192 .init = ping_v4_proc_init_net,
1190 .exit = ping_v4_proc_exit_net, 1193 .exit = ping_v4_proc_exit_net,
1191 }; 1194 };
1192 1195
1193 int __init ping_proc_init(void) 1196 int __init ping_proc_init(void)
1194 { 1197 {
1195 return register_pernet_subsys(&ping_v4_net_ops); 1198 return register_pernet_subsys(&ping_v4_net_ops);
1196 } 1199 }
1197 1200
1198 void ping_proc_exit(void) 1201 void ping_proc_exit(void)
1199 { 1202 {
1200 unregister_pernet_subsys(&ping_v4_net_ops); 1203 unregister_pernet_subsys(&ping_v4_net_ops);
1201 } 1204 }
1202 1205
1203 #endif 1206 #endif
1204 1207
1205 void __init ping_init(void) 1208 void __init ping_init(void)
1206 { 1209 {
1207 int i; 1210 int i;
1208 1211
1209 for (i = 0; i < PING_HTABLE_SIZE; i++) 1212 for (i = 0; i < PING_HTABLE_SIZE; i++)
1210 INIT_HLIST_NULLS_HEAD(&ping_table.hash[i], i); 1213 INIT_HLIST_NULLS_HEAD(&ping_table.hash[i], i);
1211 rwlock_init(&ping_table.lock); 1214 rwlock_init(&ping_table.lock);
1212 } 1215 }
1213 1216