1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* SCTP kernel implementation 2 /* SCTP kernel implementation
3 * (C) Copyright IBM Corp. 2001, 2004 3 * (C) Copyright IBM Corp. 2001, 2004
4 * Copyright (c) 1999-2000 Cisco, Inc. 4 * Copyright (c) 1999-2000 Cisco, Inc.
5 * Copyright (c) 1999-2001 Motorola, Inc. 5 * Copyright (c) 1999-2001 Motorola, Inc.
6 * Copyright (c) 2001-2003 Intel Corp. 6 * Copyright (c) 2001-2003 Intel Corp.
7 * Copyright (c) 2001-2002 Nokia, Inc. 7 * Copyright (c) 2001-2002 Nokia, Inc.
8 * Copyright (c) 2001 La Monte H.P. Yarroll 8 * Copyright (c) 2001 La Monte H.P. Yarroll
9 * 9 *
10 * This file is part of the SCTP kernel implem 10 * This file is part of the SCTP kernel implementation
11 * 11 *
12 * These functions interface with the sockets 12 * These functions interface with the sockets layer to implement the
13 * SCTP Extensions for the Sockets API. 13 * SCTP Extensions for the Sockets API.
14 * 14 *
15 * Note that the descriptions from the specifi 15 * Note that the descriptions from the specification are USER level
16 * functions--this file is the functions which 16 * functions--this file is the functions which populate the struct proto
17 * for SCTP which is the BOTTOM of the sockets 17 * for SCTP which is the BOTTOM of the sockets interface.
18 * 18 *
19 * Please send any bug reports or fixes you ma 19 * Please send any bug reports or fixes you make to the
20 * email address(es): 20 * email address(es):
21 * lksctp developers <linux-sctp@vger.kerne 21 * lksctp developers <linux-sctp@vger.kernel.org>
22 * 22 *
23 * Written or modified by: 23 * Written or modified by:
24 * La Monte H.P. Yarroll <piggy@acm.org> 24 * La Monte H.P. Yarroll <piggy@acm.org>
25 * Narasimha Budihal <narsi@refcode.org 25 * Narasimha Budihal <narsi@refcode.org>
26 * Karl Knutson <karl@athena.chica 26 * Karl Knutson <karl@athena.chicago.il.us>
27 * Jon Grimm <jgrimm@us.ibm.com 27 * Jon Grimm <jgrimm@us.ibm.com>
28 * Xingang Guo <xingang.guo@intel 28 * Xingang Guo <xingang.guo@intel.com>
29 * Daisy Chang <daisyc@us.ibm.com 29 * Daisy Chang <daisyc@us.ibm.com>
30 * Sridhar Samudrala <samudrala@us.ibm. 30 * Sridhar Samudrala <samudrala@us.ibm.com>
31 * Inaky Perez-Gonzalez <inaky.gonzalez@in 31 * Inaky Perez-Gonzalez <inaky.gonzalez@intel.com>
32 * Ardelle Fan <ardelle.fan@intel 32 * Ardelle Fan <ardelle.fan@intel.com>
33 * Ryan Layer <rmlayer@us.ibm.co 33 * Ryan Layer <rmlayer@us.ibm.com>
34 * Anup Pemmaiah <pemmaiah@cc.usu.e 34 * Anup Pemmaiah <pemmaiah@cc.usu.edu>
35 * Kevin Gao <kevin.gao@intel.c 35 * Kevin Gao <kevin.gao@intel.com>
36 */ 36 */
37 37
38 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 38 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
39 39
40 #include <crypto/hash.h> 40 #include <crypto/hash.h>
41 #include <linux/types.h> 41 #include <linux/types.h>
42 #include <linux/kernel.h> 42 #include <linux/kernel.h>
43 #include <linux/wait.h> 43 #include <linux/wait.h>
44 #include <linux/time.h> 44 #include <linux/time.h>
45 #include <linux/sched/signal.h> 45 #include <linux/sched/signal.h>
46 #include <linux/ip.h> 46 #include <linux/ip.h>
47 #include <linux/capability.h> 47 #include <linux/capability.h>
48 #include <linux/fcntl.h> 48 #include <linux/fcntl.h>
49 #include <linux/poll.h> 49 #include <linux/poll.h>
50 #include <linux/init.h> 50 #include <linux/init.h>
51 #include <linux/slab.h> 51 #include <linux/slab.h>
52 #include <linux/file.h> 52 #include <linux/file.h>
53 #include <linux/compat.h> 53 #include <linux/compat.h>
54 #include <linux/rhashtable.h> 54 #include <linux/rhashtable.h>
55 55
56 #include <net/ip.h> 56 #include <net/ip.h>
57 #include <net/icmp.h> 57 #include <net/icmp.h>
58 #include <net/route.h> 58 #include <net/route.h>
59 #include <net/ipv6.h> 59 #include <net/ipv6.h>
60 #include <net/inet_common.h> 60 #include <net/inet_common.h>
61 #include <net/busy_poll.h> 61 #include <net/busy_poll.h>
62 #include <trace/events/sock.h> <<
63 62
64 #include <linux/socket.h> /* for sa_family_t * 63 #include <linux/socket.h> /* for sa_family_t */
65 #include <linux/export.h> 64 #include <linux/export.h>
66 #include <net/sock.h> 65 #include <net/sock.h>
67 #include <net/sctp/sctp.h> 66 #include <net/sctp/sctp.h>
68 #include <net/sctp/sm.h> 67 #include <net/sctp/sm.h>
69 #include <net/sctp/stream_sched.h> 68 #include <net/sctp/stream_sched.h>
70 #include <net/rps.h> <<
71 69
72 /* Forward declarations for internal helper fu 70 /* Forward declarations for internal helper functions. */
73 static bool sctp_writeable(const struct sock * !! 71 static bool sctp_writeable(struct sock *sk);
74 static void sctp_wfree(struct sk_buff *skb); 72 static void sctp_wfree(struct sk_buff *skb);
75 static int sctp_wait_for_sndbuf(struct sctp_as 73 static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
76 size_t msg_len 74 size_t msg_len);
77 static int sctp_wait_for_packet(struct sock *s 75 static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p);
78 static int sctp_wait_for_connect(struct sctp_a 76 static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p);
79 static int sctp_wait_for_accept(struct sock *s 77 static int sctp_wait_for_accept(struct sock *sk, long timeo);
80 static void sctp_wait_for_close(struct sock *s 78 static void sctp_wait_for_close(struct sock *sk, long timeo);
81 static void sctp_destruct_sock(struct sock *sk 79 static void sctp_destruct_sock(struct sock *sk);
82 static struct sctp_af *sctp_sockaddr_af(struct 80 static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,
83 union 81 union sctp_addr *addr, int len);
84 static int sctp_bindx_add(struct sock *, struc 82 static int sctp_bindx_add(struct sock *, struct sockaddr *, int);
85 static int sctp_bindx_rem(struct sock *, struc 83 static int sctp_bindx_rem(struct sock *, struct sockaddr *, int);
86 static int sctp_send_asconf_add_ip(struct sock 84 static int sctp_send_asconf_add_ip(struct sock *, struct sockaddr *, int);
87 static int sctp_send_asconf_del_ip(struct sock 85 static int sctp_send_asconf_del_ip(struct sock *, struct sockaddr *, int);
88 static int sctp_send_asconf(struct sctp_associ 86 static int sctp_send_asconf(struct sctp_association *asoc,
89 struct sctp_chunk 87 struct sctp_chunk *chunk);
90 static int sctp_do_bind(struct sock *, union s 88 static int sctp_do_bind(struct sock *, union sctp_addr *, int);
91 static int sctp_autobind(struct sock *sk); 89 static int sctp_autobind(struct sock *sk);
92 static int sctp_sock_migrate(struct sock *olds 90 static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
93 struct sctp_assoc 91 struct sctp_association *assoc,
94 enum sctp_socket_ 92 enum sctp_socket_type type);
95 93
96 static unsigned long sctp_memory_pressure; 94 static unsigned long sctp_memory_pressure;
97 static atomic_long_t sctp_memory_allocated; 95 static atomic_long_t sctp_memory_allocated;
98 static DEFINE_PER_CPU(int, sctp_memory_per_cpu <<
99 struct percpu_counter sctp_sockets_allocated; 96 struct percpu_counter sctp_sockets_allocated;
100 97
101 static void sctp_enter_memory_pressure(struct 98 static void sctp_enter_memory_pressure(struct sock *sk)
102 { 99 {
103 WRITE_ONCE(sctp_memory_pressure, 1); !! 100 sctp_memory_pressure = 1;
104 } 101 }
105 102
106 103
107 /* Get the sndbuf space available at the time 104 /* Get the sndbuf space available at the time on the association. */
108 static inline int sctp_wspace(struct sctp_asso 105 static inline int sctp_wspace(struct sctp_association *asoc)
109 { 106 {
110 struct sock *sk = asoc->base.sk; 107 struct sock *sk = asoc->base.sk;
111 108
112 return asoc->ep->sndbuf_policy ? sk->s 109 return asoc->ep->sndbuf_policy ? sk->sk_sndbuf - asoc->sndbuf_used
113 : sk_st 110 : sk_stream_wspace(sk);
114 } 111 }
115 112
116 /* Increment the used sndbuf space count of th 113 /* Increment the used sndbuf space count of the corresponding association by
117 * the size of the outgoing data chunk. 114 * the size of the outgoing data chunk.
118 * Also, set the skb destructor for sndbuf acc 115 * Also, set the skb destructor for sndbuf accounting later.
119 * 116 *
120 * Since it is always 1-1 between chunk and sk 117 * Since it is always 1-1 between chunk and skb, and also a new skb is always
121 * allocated for chunk bundling in sctp_packet 118 * allocated for chunk bundling in sctp_packet_transmit(), we can use the
122 * destructor in the data chunk skb for the pu 119 * destructor in the data chunk skb for the purpose of the sndbuf space
123 * tracking. 120 * tracking.
124 */ 121 */
125 static inline void sctp_set_owner_w(struct sct 122 static inline void sctp_set_owner_w(struct sctp_chunk *chunk)
126 { 123 {
127 struct sctp_association *asoc = chunk- 124 struct sctp_association *asoc = chunk->asoc;
128 struct sock *sk = asoc->base.sk; 125 struct sock *sk = asoc->base.sk;
129 126
130 /* The sndbuf space is tracked per ass 127 /* The sndbuf space is tracked per association. */
131 sctp_association_hold(asoc); 128 sctp_association_hold(asoc);
132 129
133 if (chunk->shkey) 130 if (chunk->shkey)
134 sctp_auth_shkey_hold(chunk->sh 131 sctp_auth_shkey_hold(chunk->shkey);
135 132
136 skb_set_owner_w(chunk->skb, sk); 133 skb_set_owner_w(chunk->skb, sk);
137 134
138 chunk->skb->destructor = sctp_wfree; 135 chunk->skb->destructor = sctp_wfree;
139 /* Save the chunk pointer in skb for s 136 /* Save the chunk pointer in skb for sctp_wfree to use later. */
140 skb_shinfo(chunk->skb)->destructor_arg 137 skb_shinfo(chunk->skb)->destructor_arg = chunk;
141 138
142 refcount_add(sizeof(struct sctp_chunk) 139 refcount_add(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc);
143 asoc->sndbuf_used += chunk->skb->trues 140 asoc->sndbuf_used += chunk->skb->truesize + sizeof(struct sctp_chunk);
144 sk_wmem_queued_add(sk, chunk->skb->tru !! 141 sk->sk_wmem_queued += chunk->skb->truesize + sizeof(struct sctp_chunk);
145 sk_mem_charge(sk, chunk->skb->truesize 142 sk_mem_charge(sk, chunk->skb->truesize);
146 } 143 }
147 144
148 static void sctp_clear_owner_w(struct sctp_chu 145 static void sctp_clear_owner_w(struct sctp_chunk *chunk)
149 { 146 {
150 skb_orphan(chunk->skb); 147 skb_orphan(chunk->skb);
151 } 148 }
152 149
153 #define traverse_and_process() \ 150 #define traverse_and_process() \
154 do { \ 151 do { \
155 msg = chunk->msg; \ 152 msg = chunk->msg; \
156 if (msg == prev_msg) \ 153 if (msg == prev_msg) \
157 continue; \ 154 continue; \
158 list_for_each_entry(c, &msg->chunks, f 155 list_for_each_entry(c, &msg->chunks, frag_list) { \
159 if ((clear && asoc->base.sk == 156 if ((clear && asoc->base.sk == c->skb->sk) || \
160 (!clear && asoc->base.sk ! 157 (!clear && asoc->base.sk != c->skb->sk)) \
161 cb(c); \ 158 cb(c); \
162 } \ 159 } \
163 prev_msg = msg; \ 160 prev_msg = msg; \
164 } while (0) 161 } while (0)
165 162
166 static void sctp_for_each_tx_datachunk(struct 163 static void sctp_for_each_tx_datachunk(struct sctp_association *asoc,
167 bool cl 164 bool clear,
168 void (* 165 void (*cb)(struct sctp_chunk *))
169 166
170 { 167 {
171 struct sctp_datamsg *msg, *prev_msg = 168 struct sctp_datamsg *msg, *prev_msg = NULL;
172 struct sctp_outq *q = &asoc->outqueue; 169 struct sctp_outq *q = &asoc->outqueue;
173 struct sctp_chunk *chunk, *c; 170 struct sctp_chunk *chunk, *c;
174 struct sctp_transport *t; 171 struct sctp_transport *t;
175 172
176 list_for_each_entry(t, &asoc->peer.tra 173 list_for_each_entry(t, &asoc->peer.transport_addr_list, transports)
177 list_for_each_entry(chunk, &t- 174 list_for_each_entry(chunk, &t->transmitted, transmitted_list)
178 traverse_and_process() 175 traverse_and_process();
179 176
180 list_for_each_entry(chunk, &q->retrans 177 list_for_each_entry(chunk, &q->retransmit, transmitted_list)
181 traverse_and_process(); 178 traverse_and_process();
182 179
183 list_for_each_entry(chunk, &q->sacked, 180 list_for_each_entry(chunk, &q->sacked, transmitted_list)
184 traverse_and_process(); 181 traverse_and_process();
185 182
186 list_for_each_entry(chunk, &q->abandon 183 list_for_each_entry(chunk, &q->abandoned, transmitted_list)
187 traverse_and_process(); 184 traverse_and_process();
188 185
189 list_for_each_entry(chunk, &q->out_chu 186 list_for_each_entry(chunk, &q->out_chunk_list, list)
190 traverse_and_process(); 187 traverse_and_process();
191 } 188 }
192 189
193 static void sctp_for_each_rx_skb(struct sctp_a 190 static void sctp_for_each_rx_skb(struct sctp_association *asoc, struct sock *sk,
194 void (*cb)(st 191 void (*cb)(struct sk_buff *, struct sock *))
195 192
196 { 193 {
197 struct sk_buff *skb, *tmp; 194 struct sk_buff *skb, *tmp;
198 195
199 sctp_skb_for_each(skb, &asoc->ulpq.lob 196 sctp_skb_for_each(skb, &asoc->ulpq.lobby, tmp)
200 cb(skb, sk); 197 cb(skb, sk);
201 198
202 sctp_skb_for_each(skb, &asoc->ulpq.rea 199 sctp_skb_for_each(skb, &asoc->ulpq.reasm, tmp)
203 cb(skb, sk); 200 cb(skb, sk);
204 201
205 sctp_skb_for_each(skb, &asoc->ulpq.rea 202 sctp_skb_for_each(skb, &asoc->ulpq.reasm_uo, tmp)
206 cb(skb, sk); 203 cb(skb, sk);
207 } 204 }
208 205
209 /* Verify that this is a valid address. */ 206 /* Verify that this is a valid address. */
210 static inline int sctp_verify_addr(struct sock 207 static inline int sctp_verify_addr(struct sock *sk, union sctp_addr *addr,
211 int len) 208 int len)
212 { 209 {
213 struct sctp_af *af; 210 struct sctp_af *af;
214 211
215 /* Verify basic sockaddr. */ 212 /* Verify basic sockaddr. */
216 af = sctp_sockaddr_af(sctp_sk(sk), add 213 af = sctp_sockaddr_af(sctp_sk(sk), addr, len);
217 if (!af) 214 if (!af)
218 return -EINVAL; 215 return -EINVAL;
219 216
220 /* Is this a valid SCTP address? */ 217 /* Is this a valid SCTP address? */
221 if (!af->addr_valid(addr, sctp_sk(sk), 218 if (!af->addr_valid(addr, sctp_sk(sk), NULL))
222 return -EINVAL; 219 return -EINVAL;
223 220
224 if (!sctp_sk(sk)->pf->send_verify(sctp 221 if (!sctp_sk(sk)->pf->send_verify(sctp_sk(sk), (addr)))
225 return -EINVAL; 222 return -EINVAL;
226 223
227 return 0; 224 return 0;
228 } 225 }
229 226
230 /* Look up the association by its id. If this 227 /* Look up the association by its id. If this is not a UDP-style
231 * socket, the ID field is always ignored. 228 * socket, the ID field is always ignored.
232 */ 229 */
233 struct sctp_association *sctp_id2assoc(struct 230 struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id)
234 { 231 {
235 struct sctp_association *asoc = NULL; 232 struct sctp_association *asoc = NULL;
236 233
237 /* If this is not a UDP-style socket, 234 /* If this is not a UDP-style socket, assoc id should be ignored. */
238 if (!sctp_style(sk, UDP)) { 235 if (!sctp_style(sk, UDP)) {
239 /* Return NULL if the socket s 236 /* Return NULL if the socket state is not ESTABLISHED. It
240 * could be a TCP-style listen 237 * could be a TCP-style listening socket or a socket which
241 * hasn't yet called connect() 238 * hasn't yet called connect() to establish an association.
242 */ 239 */
243 if (!sctp_sstate(sk, ESTABLISH 240 if (!sctp_sstate(sk, ESTABLISHED) && !sctp_sstate(sk, CLOSING))
244 return NULL; 241 return NULL;
245 242
246 /* Get the first and the only 243 /* Get the first and the only association from the list. */
247 if (!list_empty(&sctp_sk(sk)-> 244 if (!list_empty(&sctp_sk(sk)->ep->asocs))
248 asoc = list_entry(sctp 245 asoc = list_entry(sctp_sk(sk)->ep->asocs.next,
249 stru 246 struct sctp_association, asocs);
250 return asoc; 247 return asoc;
251 } 248 }
252 249
253 /* Otherwise this is a UDP-style socke 250 /* Otherwise this is a UDP-style socket. */
254 if (id <= SCTP_ALL_ASSOC) 251 if (id <= SCTP_ALL_ASSOC)
255 return NULL; 252 return NULL;
256 253
257 spin_lock_bh(&sctp_assocs_id_lock); 254 spin_lock_bh(&sctp_assocs_id_lock);
258 asoc = (struct sctp_association *)idr_ 255 asoc = (struct sctp_association *)idr_find(&sctp_assocs_id, (int)id);
259 if (asoc && (asoc->base.sk != sk || as 256 if (asoc && (asoc->base.sk != sk || asoc->base.dead))
260 asoc = NULL; 257 asoc = NULL;
261 spin_unlock_bh(&sctp_assocs_id_lock); 258 spin_unlock_bh(&sctp_assocs_id_lock);
262 259
263 return asoc; 260 return asoc;
264 } 261 }
265 262
266 /* Look up the transport from an address and a 263 /* Look up the transport from an address and an assoc id. If both address and
267 * id are specified, the associations matching 264 * id are specified, the associations matching the address and the id should be
268 * the same. 265 * the same.
269 */ 266 */
270 static struct sctp_transport *sctp_addr_id2tra 267 static struct sctp_transport *sctp_addr_id2transport(struct sock *sk,
271 268 struct sockaddr_storage *addr,
272 269 sctp_assoc_t id)
273 { 270 {
274 struct sctp_association *addr_asoc = N 271 struct sctp_association *addr_asoc = NULL, *id_asoc = NULL;
275 struct sctp_af *af = sctp_get_af_speci 272 struct sctp_af *af = sctp_get_af_specific(addr->ss_family);
276 union sctp_addr *laddr = (union sctp_a 273 union sctp_addr *laddr = (union sctp_addr *)addr;
277 struct sctp_transport *transport; 274 struct sctp_transport *transport;
278 275
279 if (!af || sctp_verify_addr(sk, laddr, 276 if (!af || sctp_verify_addr(sk, laddr, af->sockaddr_len))
280 return NULL; 277 return NULL;
281 278
282 addr_asoc = sctp_endpoint_lookup_assoc 279 addr_asoc = sctp_endpoint_lookup_assoc(sctp_sk(sk)->ep,
283 280 laddr,
284 281 &transport);
285 282
286 if (!addr_asoc) 283 if (!addr_asoc)
287 return NULL; 284 return NULL;
288 285
289 id_asoc = sctp_id2assoc(sk, id); 286 id_asoc = sctp_id2assoc(sk, id);
290 if (id_asoc && (id_asoc != addr_asoc)) 287 if (id_asoc && (id_asoc != addr_asoc))
291 return NULL; 288 return NULL;
292 289
293 sctp_get_pf_specific(sk->sk_family)->a 290 sctp_get_pf_specific(sk->sk_family)->addr_to_user(sctp_sk(sk),
294 291 (union sctp_addr *)addr);
295 292
296 return transport; 293 return transport;
297 } 294 }
298 295
299 /* API 3.1.2 bind() - UDP Style Syntax 296 /* API 3.1.2 bind() - UDP Style Syntax
300 * The syntax of bind() is, 297 * The syntax of bind() is,
301 * 298 *
302 * ret = bind(int sd, struct sockaddr *addr, 299 * ret = bind(int sd, struct sockaddr *addr, int addrlen);
303 * 300 *
304 * sd - the socket descriptor returned 301 * sd - the socket descriptor returned by socket().
305 * addr - the address structure (struct s 302 * addr - the address structure (struct sockaddr_in or struct
306 * sockaddr_in6 [RFC 2553]), 303 * sockaddr_in6 [RFC 2553]),
307 * addr_len - the size of the address struct 304 * addr_len - the size of the address structure.
308 */ 305 */
309 static int sctp_bind(struct sock *sk, struct s 306 static int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len)
310 { 307 {
311 int retval = 0; 308 int retval = 0;
312 309
313 lock_sock(sk); 310 lock_sock(sk);
314 311
315 pr_debug("%s: sk:%p, addr:%p, addr_len 312 pr_debug("%s: sk:%p, addr:%p, addr_len:%d\n", __func__, sk,
316 addr, addr_len); 313 addr, addr_len);
317 314
318 /* Disallow binding twice. */ 315 /* Disallow binding twice. */
319 if (!sctp_sk(sk)->ep->base.bind_addr.p 316 if (!sctp_sk(sk)->ep->base.bind_addr.port)
320 retval = sctp_do_bind(sk, (uni 317 retval = sctp_do_bind(sk, (union sctp_addr *)addr,
321 addr_len 318 addr_len);
322 else 319 else
323 retval = -EINVAL; 320 retval = -EINVAL;
324 321
325 release_sock(sk); 322 release_sock(sk);
326 323
327 return retval; 324 return retval;
328 } 325 }
329 326
330 static int sctp_get_port_local(struct sock *, 327 static int sctp_get_port_local(struct sock *, union sctp_addr *);
331 328
332 /* Verify this is a valid sockaddr. */ 329 /* Verify this is a valid sockaddr. */
333 static struct sctp_af *sctp_sockaddr_af(struct 330 static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,
334 union 331 union sctp_addr *addr, int len)
335 { 332 {
336 struct sctp_af *af; 333 struct sctp_af *af;
337 334
338 /* Check minimum size. */ 335 /* Check minimum size. */
339 if (len < sizeof (struct sockaddr)) 336 if (len < sizeof (struct sockaddr))
340 return NULL; 337 return NULL;
341 338
342 if (!opt->pf->af_supported(addr->sa.sa 339 if (!opt->pf->af_supported(addr->sa.sa_family, opt))
343 return NULL; 340 return NULL;
344 341
345 if (addr->sa.sa_family == AF_INET6) { 342 if (addr->sa.sa_family == AF_INET6) {
346 if (len < SIN6_LEN_RFC2133) 343 if (len < SIN6_LEN_RFC2133)
347 return NULL; 344 return NULL;
348 /* V4 mapped address are reall 345 /* V4 mapped address are really of AF_INET family */
349 if (ipv6_addr_v4mapped(&addr-> 346 if (ipv6_addr_v4mapped(&addr->v6.sin6_addr) &&
350 !opt->pf->af_supported(AF_ 347 !opt->pf->af_supported(AF_INET, opt))
351 return NULL; 348 return NULL;
352 } 349 }
353 350
354 /* If we get this far, af is valid. */ 351 /* If we get this far, af is valid. */
355 af = sctp_get_af_specific(addr->sa.sa_ 352 af = sctp_get_af_specific(addr->sa.sa_family);
356 353
357 if (len < af->sockaddr_len) 354 if (len < af->sockaddr_len)
358 return NULL; 355 return NULL;
359 356
360 return af; 357 return af;
361 } 358 }
362 359
363 static void sctp_auto_asconf_init(struct sctp_ <<
364 { <<
365 struct net *net = sock_net(&sp->inet.s <<
366 <<
367 if (net->sctp.default_auto_asconf) { <<
368 spin_lock_bh(&net->sctp.addr_w <<
369 list_add_tail(&sp->auto_asconf <<
370 spin_unlock_bh(&net->sctp.addr <<
371 sp->do_auto_asconf = 1; <<
372 } <<
373 } <<
374 <<
375 /* Bind a local address either to an endpoint 360 /* Bind a local address either to an endpoint or to an association. */
376 static int sctp_do_bind(struct sock *sk, union 361 static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
377 { 362 {
378 struct net *net = sock_net(sk); 363 struct net *net = sock_net(sk);
379 struct sctp_sock *sp = sctp_sk(sk); 364 struct sctp_sock *sp = sctp_sk(sk);
380 struct sctp_endpoint *ep = sp->ep; 365 struct sctp_endpoint *ep = sp->ep;
381 struct sctp_bind_addr *bp = &ep->base. 366 struct sctp_bind_addr *bp = &ep->base.bind_addr;
382 struct sctp_af *af; 367 struct sctp_af *af;
383 unsigned short snum; 368 unsigned short snum;
384 int ret = 0; 369 int ret = 0;
385 370
386 /* Common sockaddr verification. */ 371 /* Common sockaddr verification. */
387 af = sctp_sockaddr_af(sp, addr, len); 372 af = sctp_sockaddr_af(sp, addr, len);
388 if (!af) { 373 if (!af) {
389 pr_debug("%s: sk:%p, newaddr:% 374 pr_debug("%s: sk:%p, newaddr:%p, len:%d EINVAL\n",
390 __func__, sk, addr, l 375 __func__, sk, addr, len);
391 return -EINVAL; 376 return -EINVAL;
392 } 377 }
393 378
394 snum = ntohs(addr->v4.sin_port); 379 snum = ntohs(addr->v4.sin_port);
395 380
396 pr_debug("%s: sk:%p, new addr:%pISc, p 381 pr_debug("%s: sk:%p, new addr:%pISc, port:%d, new port:%d, len:%d\n",
397 __func__, sk, &addr->sa, bp-> 382 __func__, sk, &addr->sa, bp->port, snum, len);
398 383
399 /* PF specific bind() address verifica 384 /* PF specific bind() address verification. */
400 if (!sp->pf->bind_verify(sp, addr)) 385 if (!sp->pf->bind_verify(sp, addr))
401 return -EADDRNOTAVAIL; 386 return -EADDRNOTAVAIL;
402 387
403 /* We must either be unbound, or bind 388 /* We must either be unbound, or bind to the same port.
404 * It's OK to allow 0 ports if we are 389 * It's OK to allow 0 ports if we are already bound.
405 * We'll just inhert an already bound 390 * We'll just inhert an already bound port in this case
406 */ 391 */
407 if (bp->port) { 392 if (bp->port) {
408 if (!snum) 393 if (!snum)
409 snum = bp->port; 394 snum = bp->port;
410 else if (snum != bp->port) { 395 else if (snum != bp->port) {
411 pr_debug("%s: new port 396 pr_debug("%s: new port %d doesn't match existing port "
412 "%d\n", __fun 397 "%d\n", __func__, snum, bp->port);
413 return -EINVAL; 398 return -EINVAL;
414 } 399 }
415 } 400 }
416 401
417 if (snum && inet_port_requires_bind_se 402 if (snum && inet_port_requires_bind_service(net, snum) &&
418 !ns_capable(net->user_ns, CAP_NET_ 403 !ns_capable(net->user_ns, CAP_NET_BIND_SERVICE))
419 return -EACCES; 404 return -EACCES;
420 405
421 /* See if the address matches any of t 406 /* See if the address matches any of the addresses we may have
422 * already bound before checking again 407 * already bound before checking against other endpoints.
423 */ 408 */
424 if (sctp_bind_addr_match(bp, addr, sp) 409 if (sctp_bind_addr_match(bp, addr, sp))
425 return -EINVAL; 410 return -EINVAL;
426 411
427 /* Make sure we are allowed to bind he 412 /* Make sure we are allowed to bind here.
428 * The function sctp_get_port_local() 413 * The function sctp_get_port_local() does duplicate address
429 * detection. 414 * detection.
430 */ 415 */
431 addr->v4.sin_port = htons(snum); 416 addr->v4.sin_port = htons(snum);
432 if (sctp_get_port_local(sk, addr)) 417 if (sctp_get_port_local(sk, addr))
433 return -EADDRINUSE; 418 return -EADDRINUSE;
434 419
435 /* Refresh ephemeral port. */ 420 /* Refresh ephemeral port. */
436 if (!bp->port) { !! 421 if (!bp->port)
437 bp->port = inet_sk(sk)->inet_n 422 bp->port = inet_sk(sk)->inet_num;
438 sctp_auto_asconf_init(sp); <<
439 } <<
440 423
441 /* Add the address to the bind address 424 /* Add the address to the bind address list.
442 * Use GFP_ATOMIC since BHs will be di 425 * Use GFP_ATOMIC since BHs will be disabled.
443 */ 426 */
444 ret = sctp_add_bind_addr(bp, addr, af- 427 ret = sctp_add_bind_addr(bp, addr, af->sockaddr_len,
445 SCTP_ADDR_SRC 428 SCTP_ADDR_SRC, GFP_ATOMIC);
446 429
447 if (ret) { 430 if (ret) {
448 sctp_put_port(sk); 431 sctp_put_port(sk);
449 return ret; 432 return ret;
450 } 433 }
451 /* Copy back into socket for getsockna 434 /* Copy back into socket for getsockname() use. */
452 inet_sk(sk)->inet_sport = htons(inet_s 435 inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
453 sp->pf->to_sk_saddr(addr, sk); 436 sp->pf->to_sk_saddr(addr, sk);
454 437
455 return ret; 438 return ret;
456 } 439 }
457 440
458 /* ADDIP Section 4.1.1 Congestion Control of 441 /* ADDIP Section 4.1.1 Congestion Control of ASCONF Chunks
459 * 442 *
460 * R1) One and only one ASCONF Chunk MAY be in 443 * R1) One and only one ASCONF Chunk MAY be in transit and unacknowledged
461 * at any one time. If a sender, after sendin 444 * at any one time. If a sender, after sending an ASCONF chunk, decides
462 * it needs to transfer another ASCONF Chunk, 445 * it needs to transfer another ASCONF Chunk, it MUST wait until the
463 * ASCONF-ACK Chunk returns from the previous 446 * ASCONF-ACK Chunk returns from the previous ASCONF Chunk before sending a
464 * subsequent ASCONF. Note this restriction bi 447 * subsequent ASCONF. Note this restriction binds each side, so at any
465 * time two ASCONF may be in-transit on any gi 448 * time two ASCONF may be in-transit on any given association (one sent
466 * from each endpoint). 449 * from each endpoint).
467 */ 450 */
468 static int sctp_send_asconf(struct sctp_associ 451 static int sctp_send_asconf(struct sctp_association *asoc,
469 struct sctp_chunk 452 struct sctp_chunk *chunk)
470 { 453 {
471 int retval = 0; 454 int retval = 0;
472 455
473 /* If there is an outstanding ASCONF c 456 /* If there is an outstanding ASCONF chunk, queue it for later
474 * transmission. 457 * transmission.
475 */ 458 */
476 if (asoc->addip_last_asconf) { 459 if (asoc->addip_last_asconf) {
477 list_add_tail(&chunk->list, &a 460 list_add_tail(&chunk->list, &asoc->addip_chunk_list);
478 goto out; 461 goto out;
479 } 462 }
480 463
481 /* Hold the chunk until an ASCONF_ACK 464 /* Hold the chunk until an ASCONF_ACK is received. */
482 sctp_chunk_hold(chunk); 465 sctp_chunk_hold(chunk);
483 retval = sctp_primitive_ASCONF(asoc->b 466 retval = sctp_primitive_ASCONF(asoc->base.net, asoc, chunk);
484 if (retval) 467 if (retval)
485 sctp_chunk_free(chunk); 468 sctp_chunk_free(chunk);
486 else 469 else
487 asoc->addip_last_asconf = chun 470 asoc->addip_last_asconf = chunk;
488 471
489 out: 472 out:
490 return retval; 473 return retval;
491 } 474 }
492 475
493 /* Add a list of addresses as bind addresses t 476 /* Add a list of addresses as bind addresses to local endpoint or
494 * association. 477 * association.
495 * 478 *
496 * Basically run through each address specifie 479 * Basically run through each address specified in the addrs/addrcnt
497 * array/length pair, determine if it is IPv6 480 * array/length pair, determine if it is IPv6 or IPv4 and call
498 * sctp_do_bind() on it. 481 * sctp_do_bind() on it.
499 * 482 *
500 * If any of them fails, then the operation wi 483 * If any of them fails, then the operation will be reversed and the
501 * ones that were added will be removed. 484 * ones that were added will be removed.
502 * 485 *
503 * Only sctp_setsockopt_bindx() is supposed to 486 * Only sctp_setsockopt_bindx() is supposed to call this function.
504 */ 487 */
505 static int sctp_bindx_add(struct sock *sk, str 488 static int sctp_bindx_add(struct sock *sk, struct sockaddr *addrs, int addrcnt)
506 { 489 {
507 int cnt; 490 int cnt;
508 int retval = 0; 491 int retval = 0;
509 void *addr_buf; 492 void *addr_buf;
510 struct sockaddr *sa_addr; 493 struct sockaddr *sa_addr;
511 struct sctp_af *af; 494 struct sctp_af *af;
512 495
513 pr_debug("%s: sk:%p, addrs:%p, addrcnt 496 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n", __func__, sk,
514 addrs, addrcnt); 497 addrs, addrcnt);
515 498
516 addr_buf = addrs; 499 addr_buf = addrs;
517 for (cnt = 0; cnt < addrcnt; cnt++) { 500 for (cnt = 0; cnt < addrcnt; cnt++) {
518 /* The list may contain either 501 /* The list may contain either IPv4 or IPv6 address;
519 * determine the address lengt 502 * determine the address length for walking thru the list.
520 */ 503 */
521 sa_addr = addr_buf; 504 sa_addr = addr_buf;
522 af = sctp_get_af_specific(sa_a 505 af = sctp_get_af_specific(sa_addr->sa_family);
523 if (!af) { 506 if (!af) {
524 retval = -EINVAL; 507 retval = -EINVAL;
525 goto err_bindx_add; 508 goto err_bindx_add;
526 } 509 }
527 510
528 retval = sctp_do_bind(sk, (uni 511 retval = sctp_do_bind(sk, (union sctp_addr *)sa_addr,
529 af->sock 512 af->sockaddr_len);
530 513
531 addr_buf += af->sockaddr_len; 514 addr_buf += af->sockaddr_len;
532 515
533 err_bindx_add: 516 err_bindx_add:
534 if (retval < 0) { 517 if (retval < 0) {
535 /* Failed. Cleanup the 518 /* Failed. Cleanup the ones that have been added */
536 if (cnt > 0) 519 if (cnt > 0)
537 sctp_bindx_rem 520 sctp_bindx_rem(sk, addrs, cnt);
538 return retval; 521 return retval;
539 } 522 }
540 } 523 }
541 524
542 return retval; 525 return retval;
543 } 526 }
544 527
545 /* Send an ASCONF chunk with Add IP address pa 528 /* Send an ASCONF chunk with Add IP address parameters to all the peers of the
546 * associations that are part of the endpoint 529 * associations that are part of the endpoint indicating that a list of local
547 * addresses are added to the endpoint. 530 * addresses are added to the endpoint.
548 * 531 *
549 * If any of the addresses is already in the b 532 * If any of the addresses is already in the bind address list of the
550 * association, we do not send the chunk for t 533 * association, we do not send the chunk for that association. But it will not
551 * affect other associations. 534 * affect other associations.
552 * 535 *
553 * Only sctp_setsockopt_bindx() is supposed to 536 * Only sctp_setsockopt_bindx() is supposed to call this function.
554 */ 537 */
555 static int sctp_send_asconf_add_ip(struct sock 538 static int sctp_send_asconf_add_ip(struct sock *sk,
556 struct sock 539 struct sockaddr *addrs,
557 int 540 int addrcnt)
558 { 541 {
559 struct sctp_sock *sp; 542 struct sctp_sock *sp;
560 struct sctp_endpoint *ep; 543 struct sctp_endpoint *ep;
561 struct sctp_association *asoc; 544 struct sctp_association *asoc;
562 struct sctp_bind_addr *bp; 545 struct sctp_bind_addr *bp;
563 struct sctp_chunk *chunk 546 struct sctp_chunk *chunk;
564 struct sctp_sockaddr_entry *laddr 547 struct sctp_sockaddr_entry *laddr;
565 union sctp_addr *addr; 548 union sctp_addr *addr;
566 union sctp_addr savead 549 union sctp_addr saveaddr;
567 void *addr_ 550 void *addr_buf;
568 struct sctp_af *af; 551 struct sctp_af *af;
569 struct list_head *p; 552 struct list_head *p;
570 int i; 553 int i;
571 int retval 554 int retval = 0;
572 555
573 sp = sctp_sk(sk); 556 sp = sctp_sk(sk);
574 ep = sp->ep; 557 ep = sp->ep;
575 558
576 if (!ep->asconf_enable) 559 if (!ep->asconf_enable)
577 return retval; 560 return retval;
578 561
579 pr_debug("%s: sk:%p, addrs:%p, addrcnt 562 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
580 __func__, sk, addrs, addrcnt) 563 __func__, sk, addrs, addrcnt);
581 564
582 list_for_each_entry(asoc, &ep->asocs, 565 list_for_each_entry(asoc, &ep->asocs, asocs) {
583 if (!asoc->peer.asconf_capable 566 if (!asoc->peer.asconf_capable)
584 continue; 567 continue;
585 568
586 if (asoc->peer.addip_disabled_ 569 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_ADD_IP)
587 continue; 570 continue;
588 571
589 if (!sctp_state(asoc, ESTABLIS 572 if (!sctp_state(asoc, ESTABLISHED))
590 continue; 573 continue;
591 574
592 /* Check if any address in the 575 /* Check if any address in the packed array of addresses is
593 * in the bind address list of 576 * in the bind address list of the association. If so,
594 * do not send the asconf chun 577 * do not send the asconf chunk to its peer, but continue with
595 * other associations. 578 * other associations.
596 */ 579 */
597 addr_buf = addrs; 580 addr_buf = addrs;
598 for (i = 0; i < addrcnt; i++) 581 for (i = 0; i < addrcnt; i++) {
599 addr = addr_buf; 582 addr = addr_buf;
600 af = sctp_get_af_speci 583 af = sctp_get_af_specific(addr->v4.sin_family);
601 if (!af) { 584 if (!af) {
602 retval = -EINV 585 retval = -EINVAL;
603 goto out; 586 goto out;
604 } 587 }
605 588
606 if (sctp_assoc_lookup_ 589 if (sctp_assoc_lookup_laddr(asoc, addr))
607 break; 590 break;
608 591
609 addr_buf += af->sockad 592 addr_buf += af->sockaddr_len;
610 } 593 }
611 if (i < addrcnt) 594 if (i < addrcnt)
612 continue; 595 continue;
613 596
614 /* Use the first valid address 597 /* Use the first valid address in bind addr list of
615 * association as Address Para 598 * association as Address Parameter of ASCONF CHUNK.
616 */ 599 */
617 bp = &asoc->base.bind_addr; 600 bp = &asoc->base.bind_addr;
618 p = bp->address_list.next; 601 p = bp->address_list.next;
619 laddr = list_entry(p, struct s 602 laddr = list_entry(p, struct sctp_sockaddr_entry, list);
620 chunk = sctp_make_asconf_updat 603 chunk = sctp_make_asconf_update_ip(asoc, &laddr->a, addrs,
621 604 addrcnt, SCTP_PARAM_ADD_IP);
622 if (!chunk) { 605 if (!chunk) {
623 retval = -ENOMEM; 606 retval = -ENOMEM;
624 goto out; 607 goto out;
625 } 608 }
626 609
627 /* Add the new addresses to th 610 /* Add the new addresses to the bind address list with
628 * use_as_src set to 0. 611 * use_as_src set to 0.
629 */ 612 */
630 addr_buf = addrs; 613 addr_buf = addrs;
631 for (i = 0; i < addrcnt; i++) 614 for (i = 0; i < addrcnt; i++) {
632 addr = addr_buf; 615 addr = addr_buf;
633 af = sctp_get_af_speci 616 af = sctp_get_af_specific(addr->v4.sin_family);
634 memcpy(&saveaddr, addr 617 memcpy(&saveaddr, addr, af->sockaddr_len);
635 retval = sctp_add_bind 618 retval = sctp_add_bind_addr(bp, &saveaddr,
636 619 sizeof(saveaddr),
637 620 SCTP_ADDR_NEW, GFP_ATOMIC);
638 addr_buf += af->sockad 621 addr_buf += af->sockaddr_len;
639 } 622 }
640 if (asoc->src_out_of_asoc_ok) 623 if (asoc->src_out_of_asoc_ok) {
641 struct sctp_transport 624 struct sctp_transport *trans;
642 625
643 list_for_each_entry(tr 626 list_for_each_entry(trans,
644 &asoc->peer.transp 627 &asoc->peer.transport_addr_list, transports) {
645 trans->cwnd = 628 trans->cwnd = min(4*asoc->pathmtu, max_t(__u32,
646 2*asoc->pa 629 2*asoc->pathmtu, 4380));
647 trans->ssthres 630 trans->ssthresh = asoc->peer.i.a_rwnd;
648 trans->rto = a 631 trans->rto = asoc->rto_initial;
649 sctp_max_rto(a 632 sctp_max_rto(asoc, trans);
650 trans->rtt = t 633 trans->rtt = trans->srtt = trans->rttvar = 0;
651 /* Clear the s 634 /* Clear the source and route cache */
652 sctp_transport 635 sctp_transport_route(trans, NULL,
653 636 sctp_sk(asoc->base.sk));
654 } 637 }
655 } 638 }
656 retval = sctp_send_asconf(asoc 639 retval = sctp_send_asconf(asoc, chunk);
657 } 640 }
658 641
659 out: 642 out:
660 return retval; 643 return retval;
661 } 644 }
662 645
663 /* Remove a list of addresses from bind addres 646 /* Remove a list of addresses from bind addresses list. Do not remove the
664 * last address. 647 * last address.
665 * 648 *
666 * Basically run through each address specifie 649 * Basically run through each address specified in the addrs/addrcnt
667 * array/length pair, determine if it is IPv6 650 * array/length pair, determine if it is IPv6 or IPv4 and call
668 * sctp_del_bind() on it. 651 * sctp_del_bind() on it.
669 * 652 *
670 * If any of them fails, then the operation wi 653 * If any of them fails, then the operation will be reversed and the
671 * ones that were removed will be added back. 654 * ones that were removed will be added back.
672 * 655 *
673 * At least one address has to be left; if onl 656 * At least one address has to be left; if only one address is
674 * available, the operation will return -EBUSY 657 * available, the operation will return -EBUSY.
675 * 658 *
676 * Only sctp_setsockopt_bindx() is supposed to 659 * Only sctp_setsockopt_bindx() is supposed to call this function.
677 */ 660 */
678 static int sctp_bindx_rem(struct sock *sk, str 661 static int sctp_bindx_rem(struct sock *sk, struct sockaddr *addrs, int addrcnt)
679 { 662 {
680 struct sctp_sock *sp = sctp_sk(sk); 663 struct sctp_sock *sp = sctp_sk(sk);
681 struct sctp_endpoint *ep = sp->ep; 664 struct sctp_endpoint *ep = sp->ep;
682 int cnt; 665 int cnt;
683 struct sctp_bind_addr *bp = &ep->base. 666 struct sctp_bind_addr *bp = &ep->base.bind_addr;
684 int retval = 0; 667 int retval = 0;
685 void *addr_buf; 668 void *addr_buf;
686 union sctp_addr *sa_addr; 669 union sctp_addr *sa_addr;
687 struct sctp_af *af; 670 struct sctp_af *af;
688 671
689 pr_debug("%s: sk:%p, addrs:%p, addrcnt 672 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
690 __func__, sk, addrs, addrcnt) 673 __func__, sk, addrs, addrcnt);
691 674
692 addr_buf = addrs; 675 addr_buf = addrs;
693 for (cnt = 0; cnt < addrcnt; cnt++) { 676 for (cnt = 0; cnt < addrcnt; cnt++) {
694 /* If the bind address list is 677 /* If the bind address list is empty or if there is only one
695 * bind address, there is noth 678 * bind address, there is nothing more to be removed (we need
696 * at least one address here). 679 * at least one address here).
697 */ 680 */
698 if (list_empty(&bp->address_li 681 if (list_empty(&bp->address_list) ||
699 (sctp_list_single_entry(&b 682 (sctp_list_single_entry(&bp->address_list))) {
700 retval = -EBUSY; 683 retval = -EBUSY;
701 goto err_bindx_rem; 684 goto err_bindx_rem;
702 } 685 }
703 686
704 sa_addr = addr_buf; 687 sa_addr = addr_buf;
705 af = sctp_get_af_specific(sa_a 688 af = sctp_get_af_specific(sa_addr->sa.sa_family);
706 if (!af) { 689 if (!af) {
707 retval = -EINVAL; 690 retval = -EINVAL;
708 goto err_bindx_rem; 691 goto err_bindx_rem;
709 } 692 }
710 693
711 if (!af->addr_valid(sa_addr, s 694 if (!af->addr_valid(sa_addr, sp, NULL)) {
712 retval = -EADDRNOTAVAI 695 retval = -EADDRNOTAVAIL;
713 goto err_bindx_rem; 696 goto err_bindx_rem;
714 } 697 }
715 698
716 if (sa_addr->v4.sin_port && 699 if (sa_addr->v4.sin_port &&
717 sa_addr->v4.sin_port != ht 700 sa_addr->v4.sin_port != htons(bp->port)) {
718 retval = -EINVAL; 701 retval = -EINVAL;
719 goto err_bindx_rem; 702 goto err_bindx_rem;
720 } 703 }
721 704
722 if (!sa_addr->v4.sin_port) 705 if (!sa_addr->v4.sin_port)
723 sa_addr->v4.sin_port = 706 sa_addr->v4.sin_port = htons(bp->port);
724 707
725 /* FIXME - There is probably a 708 /* FIXME - There is probably a need to check if sk->sk_saddr and
726 * sk->sk_rcv_addr are current 709 * sk->sk_rcv_addr are currently set to one of the addresses to
727 * be removed. This is somethi 710 * be removed. This is something which needs to be looked into
728 * when we are fixing the outs 711 * when we are fixing the outstanding issues with multi-homing
729 * socket routing and failover 712 * socket routing and failover schemes. Refer to comments in
730 * sctp_do_bind(). -daisy 713 * sctp_do_bind(). -daisy
731 */ 714 */
732 retval = sctp_del_bind_addr(bp 715 retval = sctp_del_bind_addr(bp, sa_addr);
733 716
734 addr_buf += af->sockaddr_len; 717 addr_buf += af->sockaddr_len;
735 err_bindx_rem: 718 err_bindx_rem:
736 if (retval < 0) { 719 if (retval < 0) {
737 /* Failed. Add the one 720 /* Failed. Add the ones that has been removed back */
738 if (cnt > 0) 721 if (cnt > 0)
739 sctp_bindx_add 722 sctp_bindx_add(sk, addrs, cnt);
740 return retval; 723 return retval;
741 } 724 }
742 } 725 }
743 726
744 return retval; 727 return retval;
745 } 728 }
746 729
747 /* Send an ASCONF chunk with Delete IP address 730 /* Send an ASCONF chunk with Delete IP address parameters to all the peers of
748 * the associations that are part of the endpo 731 * the associations that are part of the endpoint indicating that a list of
749 * local addresses are removed from the endpoi 732 * local addresses are removed from the endpoint.
750 * 733 *
751 * If any of the addresses is already in the b 734 * If any of the addresses is already in the bind address list of the
752 * association, we do not send the chunk for t 735 * association, we do not send the chunk for that association. But it will not
753 * affect other associations. 736 * affect other associations.
754 * 737 *
755 * Only sctp_setsockopt_bindx() is supposed to 738 * Only sctp_setsockopt_bindx() is supposed to call this function.
756 */ 739 */
757 static int sctp_send_asconf_del_ip(struct sock 740 static int sctp_send_asconf_del_ip(struct sock *sk,
758 struct sock 741 struct sockaddr *addrs,
759 int 742 int addrcnt)
760 { 743 {
761 struct sctp_sock *sp; 744 struct sctp_sock *sp;
762 struct sctp_endpoint *ep; 745 struct sctp_endpoint *ep;
763 struct sctp_association *asoc; 746 struct sctp_association *asoc;
764 struct sctp_transport *transport; 747 struct sctp_transport *transport;
765 struct sctp_bind_addr *bp; 748 struct sctp_bind_addr *bp;
766 struct sctp_chunk *chunk; 749 struct sctp_chunk *chunk;
767 union sctp_addr *laddr; 750 union sctp_addr *laddr;
768 void *addr_buf; 751 void *addr_buf;
769 struct sctp_af *af; 752 struct sctp_af *af;
770 struct sctp_sockaddr_entry *saddr; 753 struct sctp_sockaddr_entry *saddr;
771 int i; 754 int i;
772 int retval = 0; 755 int retval = 0;
773 int stored = 0; 756 int stored = 0;
774 757
775 chunk = NULL; 758 chunk = NULL;
776 sp = sctp_sk(sk); 759 sp = sctp_sk(sk);
777 ep = sp->ep; 760 ep = sp->ep;
778 761
779 if (!ep->asconf_enable) 762 if (!ep->asconf_enable)
780 return retval; 763 return retval;
781 764
782 pr_debug("%s: sk:%p, addrs:%p, addrcnt 765 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
783 __func__, sk, addrs, addrcnt) 766 __func__, sk, addrs, addrcnt);
784 767
785 list_for_each_entry(asoc, &ep->asocs, 768 list_for_each_entry(asoc, &ep->asocs, asocs) {
786 769
787 if (!asoc->peer.asconf_capable 770 if (!asoc->peer.asconf_capable)
788 continue; 771 continue;
789 772
790 if (asoc->peer.addip_disabled_ 773 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_DEL_IP)
791 continue; 774 continue;
792 775
793 if (!sctp_state(asoc, ESTABLIS 776 if (!sctp_state(asoc, ESTABLISHED))
794 continue; 777 continue;
795 778
796 /* Check if any address in the 779 /* Check if any address in the packed array of addresses is
797 * not present in the bind add 780 * not present in the bind address list of the association.
798 * If so, do not send the asco 781 * If so, do not send the asconf chunk to its peer, but
799 * continue with other associa 782 * continue with other associations.
800 */ 783 */
801 addr_buf = addrs; 784 addr_buf = addrs;
802 for (i = 0; i < addrcnt; i++) 785 for (i = 0; i < addrcnt; i++) {
803 laddr = addr_buf; 786 laddr = addr_buf;
804 af = sctp_get_af_speci 787 af = sctp_get_af_specific(laddr->v4.sin_family);
805 if (!af) { 788 if (!af) {
806 retval = -EINV 789 retval = -EINVAL;
807 goto out; 790 goto out;
808 } 791 }
809 792
810 if (!sctp_assoc_lookup 793 if (!sctp_assoc_lookup_laddr(asoc, laddr))
811 break; 794 break;
812 795
813 addr_buf += af->sockad 796 addr_buf += af->sockaddr_len;
814 } 797 }
815 if (i < addrcnt) 798 if (i < addrcnt)
816 continue; 799 continue;
817 800
818 /* Find one address in the ass 801 /* Find one address in the association's bind address list
819 * that is not in the packed a 802 * that is not in the packed array of addresses. This is to
820 * make sure that we do not de 803 * make sure that we do not delete all the addresses in the
821 * association. 804 * association.
822 */ 805 */
823 bp = &asoc->base.bind_addr; 806 bp = &asoc->base.bind_addr;
824 laddr = sctp_find_unmatch_addr 807 laddr = sctp_find_unmatch_addr(bp, (union sctp_addr *)addrs,
825 808 addrcnt, sp);
826 if ((laddr == NULL) && (addrcn 809 if ((laddr == NULL) && (addrcnt == 1)) {
827 if (asoc->asconf_addr_ 810 if (asoc->asconf_addr_del_pending)
828 continue; 811 continue;
829 asoc->asconf_addr_del_ 812 asoc->asconf_addr_del_pending =
830 kzalloc(sizeof(uni 813 kzalloc(sizeof(union sctp_addr), GFP_ATOMIC);
831 if (asoc->asconf_addr_ 814 if (asoc->asconf_addr_del_pending == NULL) {
832 retval = -ENOM 815 retval = -ENOMEM;
833 goto out; 816 goto out;
834 } 817 }
835 asoc->asconf_addr_del_ 818 asoc->asconf_addr_del_pending->sa.sa_family =
836 addrs->sa_ 819 addrs->sa_family;
837 asoc->asconf_addr_del_ 820 asoc->asconf_addr_del_pending->v4.sin_port =
838 htons(bp-> 821 htons(bp->port);
839 if (addrs->sa_family = 822 if (addrs->sa_family == AF_INET) {
840 struct sockadd 823 struct sockaddr_in *sin;
841 824
842 sin = (struct 825 sin = (struct sockaddr_in *)addrs;
843 asoc->asconf_a 826 asoc->asconf_addr_del_pending->v4.sin_addr.s_addr = sin->sin_addr.s_addr;
844 } else if (addrs->sa_f 827 } else if (addrs->sa_family == AF_INET6) {
845 struct sockadd 828 struct sockaddr_in6 *sin6;
846 829
847 sin6 = (struct 830 sin6 = (struct sockaddr_in6 *)addrs;
848 asoc->asconf_a 831 asoc->asconf_addr_del_pending->v6.sin6_addr = sin6->sin6_addr;
849 } 832 }
850 833
851 pr_debug("%s: keep the 834 pr_debug("%s: keep the last address asoc:%p %pISc at %p\n",
852 __func__, aso 835 __func__, asoc, &asoc->asconf_addr_del_pending->sa,
853 asoc->asconf_ 836 asoc->asconf_addr_del_pending);
854 837
855 asoc->src_out_of_asoc_ 838 asoc->src_out_of_asoc_ok = 1;
856 stored = 1; 839 stored = 1;
857 goto skip_mkasconf; 840 goto skip_mkasconf;
858 } 841 }
859 842
860 if (laddr == NULL) 843 if (laddr == NULL)
861 return -EINVAL; 844 return -EINVAL;
862 845
863 /* We do not need RCU protecti 846 /* We do not need RCU protection throughout this loop
864 * because this is done under 847 * because this is done under a socket lock from the
865 * setsockopt call. 848 * setsockopt call.
866 */ 849 */
867 chunk = sctp_make_asconf_updat 850 chunk = sctp_make_asconf_update_ip(asoc, laddr, addrs, addrcnt,
868 851 SCTP_PARAM_DEL_IP);
869 if (!chunk) { 852 if (!chunk) {
870 retval = -ENOMEM; 853 retval = -ENOMEM;
871 goto out; 854 goto out;
872 } 855 }
873 856
874 skip_mkasconf: 857 skip_mkasconf:
875 /* Reset use_as_src flag for t 858 /* Reset use_as_src flag for the addresses in the bind address
876 * list that are to be deleted 859 * list that are to be deleted.
877 */ 860 */
878 addr_buf = addrs; 861 addr_buf = addrs;
879 for (i = 0; i < addrcnt; i++) 862 for (i = 0; i < addrcnt; i++) {
880 laddr = addr_buf; 863 laddr = addr_buf;
881 af = sctp_get_af_speci 864 af = sctp_get_af_specific(laddr->v4.sin_family);
882 list_for_each_entry(sa 865 list_for_each_entry(saddr, &bp->address_list, list) {
883 if (sctp_cmp_a 866 if (sctp_cmp_addr_exact(&saddr->a, laddr))
884 saddr- 867 saddr->state = SCTP_ADDR_DEL;
885 } 868 }
886 addr_buf += af->sockad 869 addr_buf += af->sockaddr_len;
887 } 870 }
888 871
889 /* Update the route and saddr 872 /* Update the route and saddr entries for all the transports
890 * as some of the addresses in 873 * as some of the addresses in the bind address list are
891 * about to be deleted and can 874 * about to be deleted and cannot be used as source addresses.
892 */ 875 */
893 list_for_each_entry(transport, 876 list_for_each_entry(transport, &asoc->peer.transport_addr_list,
894 transp 877 transports) {
895 sctp_transport_route(t 878 sctp_transport_route(transport, NULL,
896 s 879 sctp_sk(asoc->base.sk));
897 } 880 }
898 881
899 if (stored) 882 if (stored)
900 /* We don't need to tr 883 /* We don't need to transmit ASCONF */
901 continue; 884 continue;
902 retval = sctp_send_asconf(asoc 885 retval = sctp_send_asconf(asoc, chunk);
903 } 886 }
904 out: 887 out:
905 return retval; 888 return retval;
906 } 889 }
907 890
908 /* set addr events to assocs in the endpoint. 891 /* set addr events to assocs in the endpoint. ep and addr_wq must be locked */
909 int sctp_asconf_mgmt(struct sctp_sock *sp, str 892 int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw)
910 { 893 {
911 struct sock *sk = sctp_opt2sk(sp); 894 struct sock *sk = sctp_opt2sk(sp);
912 union sctp_addr *addr; 895 union sctp_addr *addr;
913 struct sctp_af *af; 896 struct sctp_af *af;
914 897
915 /* It is safe to write port space in c 898 /* It is safe to write port space in caller. */
916 addr = &addrw->a; 899 addr = &addrw->a;
917 addr->v4.sin_port = htons(sp->ep->base 900 addr->v4.sin_port = htons(sp->ep->base.bind_addr.port);
918 af = sctp_get_af_specific(addr->sa.sa_ 901 af = sctp_get_af_specific(addr->sa.sa_family);
919 if (!af) 902 if (!af)
920 return -EINVAL; 903 return -EINVAL;
921 if (sctp_verify_addr(sk, addr, af->soc 904 if (sctp_verify_addr(sk, addr, af->sockaddr_len))
922 return -EINVAL; 905 return -EINVAL;
923 906
924 if (addrw->state == SCTP_ADDR_NEW) 907 if (addrw->state == SCTP_ADDR_NEW)
925 return sctp_send_asconf_add_ip 908 return sctp_send_asconf_add_ip(sk, (struct sockaddr *)addr, 1);
926 else 909 else
927 return sctp_send_asconf_del_ip 910 return sctp_send_asconf_del_ip(sk, (struct sockaddr *)addr, 1);
928 } 911 }
929 912
930 /* Helper for tunneling sctp_bindx() requests 913 /* Helper for tunneling sctp_bindx() requests through sctp_setsockopt()
931 * 914 *
932 * API 8.1 915 * API 8.1
933 * int sctp_bindx(int sd, struct sockaddr *add 916 * int sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt,
934 * int flags); 917 * int flags);
935 * 918 *
936 * If sd is an IPv4 socket, the addresses pass 919 * If sd is an IPv4 socket, the addresses passed must be IPv4 addresses.
937 * If the sd is an IPv6 socket, the addresses 920 * If the sd is an IPv6 socket, the addresses passed can either be IPv4
938 * or IPv6 addresses. 921 * or IPv6 addresses.
939 * 922 *
940 * A single address may be specified as INADDR 923 * A single address may be specified as INADDR_ANY or IN6ADDR_ANY, see
941 * Section 3.1.2 for this usage. 924 * Section 3.1.2 for this usage.
942 * 925 *
943 * addrs is a pointer to an array of one or mo 926 * addrs is a pointer to an array of one or more socket addresses. Each
944 * address is contained in its appropriate str 927 * address is contained in its appropriate structure (i.e. struct
945 * sockaddr_in or struct sockaddr_in6) the fam 928 * sockaddr_in or struct sockaddr_in6) the family of the address type
946 * must be used to distinguish the address len 929 * must be used to distinguish the address length (note that this
947 * representation is termed a "packed array" o 930 * representation is termed a "packed array" of addresses). The caller
948 * specifies the number of addresses in the ar 931 * specifies the number of addresses in the array with addrcnt.
949 * 932 *
950 * On success, sctp_bindx() returns 0. On fail 933 * On success, sctp_bindx() returns 0. On failure, sctp_bindx() returns
951 * -1, and sets errno to the appropriate error 934 * -1, and sets errno to the appropriate error code.
952 * 935 *
953 * For SCTP, the port given in each socket add 936 * For SCTP, the port given in each socket address must be the same, or
954 * sctp_bindx() will fail, setting errno to EI 937 * sctp_bindx() will fail, setting errno to EINVAL.
955 * 938 *
956 * The flags parameter is formed from the bitw 939 * The flags parameter is formed from the bitwise OR of zero or more of
957 * the following currently defined flags: 940 * the following currently defined flags:
958 * 941 *
959 * SCTP_BINDX_ADD_ADDR 942 * SCTP_BINDX_ADD_ADDR
960 * 943 *
961 * SCTP_BINDX_REM_ADDR 944 * SCTP_BINDX_REM_ADDR
962 * 945 *
963 * SCTP_BINDX_ADD_ADDR directs SCTP to add the 946 * SCTP_BINDX_ADD_ADDR directs SCTP to add the given addresses to the
964 * association, and SCTP_BINDX_REM_ADDR direct 947 * association, and SCTP_BINDX_REM_ADDR directs SCTP to remove the given
965 * addresses from the association. The two fla 948 * addresses from the association. The two flags are mutually exclusive;
966 * if both are given, sctp_bindx() will fail w 949 * if both are given, sctp_bindx() will fail with EINVAL. A caller may
967 * not remove all addresses from an associatio 950 * not remove all addresses from an association; sctp_bindx() will
968 * reject such an attempt with EINVAL. 951 * reject such an attempt with EINVAL.
969 * 952 *
970 * An application can use sctp_bindx(SCTP_BIND 953 * An application can use sctp_bindx(SCTP_BINDX_ADD_ADDR) to associate
971 * additional addresses with an endpoint after 954 * additional addresses with an endpoint after calling bind(). Or use
972 * sctp_bindx(SCTP_BINDX_REM_ADDR) to remove s 955 * sctp_bindx(SCTP_BINDX_REM_ADDR) to remove some addresses a listening
973 * socket is associated with so that no new as 956 * socket is associated with so that no new association accepted will be
974 * associated with those addresses. If the end 957 * associated with those addresses. If the endpoint supports dynamic
975 * address a SCTP_BINDX_REM_ADDR or SCTP_BINDX 958 * address a SCTP_BINDX_REM_ADDR or SCTP_BINDX_ADD_ADDR may cause a
976 * endpoint to send the appropriate message to 959 * endpoint to send the appropriate message to the peer to change the
977 * peers address lists. 960 * peers address lists.
978 * 961 *
979 * Adding and removing addresses from a connec 962 * Adding and removing addresses from a connected association is
980 * optional functionality. Implementations tha 963 * optional functionality. Implementations that do not support this
981 * functionality should return EOPNOTSUPP. 964 * functionality should return EOPNOTSUPP.
982 * 965 *
983 * Basically do nothing but copying the addres 966 * Basically do nothing but copying the addresses from user to kernel
984 * land and invoking either sctp_bindx_add() o 967 * land and invoking either sctp_bindx_add() or sctp_bindx_rem() on the sk.
985 * This is used for tunneling the sctp_bindx() 968 * This is used for tunneling the sctp_bindx() request through sctp_setsockopt()
986 * from userspace. 969 * from userspace.
987 * 970 *
988 * On exit there is no need to do sockfd_put() 971 * On exit there is no need to do sockfd_put(), sys_setsockopt() does
989 * it. 972 * it.
990 * 973 *
991 * sk The sk of the socket 974 * sk The sk of the socket
992 * addrs The pointer to the addresses !! 975 * addrs The pointer to the addresses in user land
993 * addrssize Size of the addrs buffer 976 * addrssize Size of the addrs buffer
994 * op Operation to perform (add or remo 977 * op Operation to perform (add or remove, see the flags of
995 * sctp_bindx) 978 * sctp_bindx)
996 * 979 *
997 * Returns 0 if ok, <0 errno code on error. 980 * Returns 0 if ok, <0 errno code on error.
998 */ 981 */
999 static int sctp_setsockopt_bindx(struct sock * !! 982 static int sctp_setsockopt_bindx(struct sock *sk,
>> 983 struct sockaddr __user *addrs,
1000 int addrs_si 984 int addrs_size, int op)
1001 { 985 {
>> 986 struct sockaddr *kaddrs;
1002 int err; 987 int err;
1003 int addrcnt = 0; 988 int addrcnt = 0;
1004 int walk_size = 0; 989 int walk_size = 0;
1005 struct sockaddr *sa_addr; 990 struct sockaddr *sa_addr;
1006 void *addr_buf = addrs; !! 991 void *addr_buf;
1007 struct sctp_af *af; 992 struct sctp_af *af;
1008 993
1009 pr_debug("%s: sk:%p addrs:%p addrs_si 994 pr_debug("%s: sk:%p addrs:%p addrs_size:%d opt:%d\n",
1010 __func__, sk, addr_buf, addr !! 995 __func__, sk, addrs, addrs_size, op);
1011 996
1012 if (unlikely(addrs_size <= 0)) 997 if (unlikely(addrs_size <= 0))
1013 return -EINVAL; 998 return -EINVAL;
1014 999
>> 1000 kaddrs = memdup_user(addrs, addrs_size);
>> 1001 if (IS_ERR(kaddrs))
>> 1002 return PTR_ERR(kaddrs);
>> 1003
1015 /* Walk through the addrs buffer and 1004 /* Walk through the addrs buffer and count the number of addresses. */
>> 1005 addr_buf = kaddrs;
1016 while (walk_size < addrs_size) { 1006 while (walk_size < addrs_size) {
1017 if (walk_size + sizeof(sa_fam !! 1007 if (walk_size + sizeof(sa_family_t) > addrs_size) {
>> 1008 kfree(kaddrs);
1018 return -EINVAL; 1009 return -EINVAL;
>> 1010 }
1019 1011
1020 sa_addr = addr_buf; 1012 sa_addr = addr_buf;
1021 af = sctp_get_af_specific(sa_ 1013 af = sctp_get_af_specific(sa_addr->sa_family);
1022 1014
1023 /* If the address family is n 1015 /* If the address family is not supported or if this address
1024 * causes the address buffer 1016 * causes the address buffer to overflow return EINVAL.
1025 */ 1017 */
1026 if (!af || (walk_size + af->s !! 1018 if (!af || (walk_size + af->sockaddr_len) > addrs_size) {
>> 1019 kfree(kaddrs);
1027 return -EINVAL; 1020 return -EINVAL;
>> 1021 }
1028 addrcnt++; 1022 addrcnt++;
1029 addr_buf += af->sockaddr_len; 1023 addr_buf += af->sockaddr_len;
1030 walk_size += af->sockaddr_len 1024 walk_size += af->sockaddr_len;
1031 } 1025 }
1032 1026
1033 /* Do the work. */ 1027 /* Do the work. */
1034 switch (op) { 1028 switch (op) {
1035 case SCTP_BINDX_ADD_ADDR: 1029 case SCTP_BINDX_ADD_ADDR:
1036 /* Allow security module to v 1030 /* Allow security module to validate bindx addresses. */
1037 err = security_sctp_bind_conn 1031 err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_BINDX_ADD,
1038 !! 1032 (struct sockaddr *)kaddrs,
>> 1033 addrs_size);
1039 if (err) 1034 if (err)
1040 return err; !! 1035 goto out;
1041 err = sctp_bindx_add(sk, addr !! 1036 err = sctp_bindx_add(sk, kaddrs, addrcnt);
1042 if (err) 1037 if (err)
1043 return err; !! 1038 goto out;
1044 return sctp_send_asconf_add_i !! 1039 err = sctp_send_asconf_add_ip(sk, kaddrs, addrcnt);
>> 1040 break;
>> 1041
1045 case SCTP_BINDX_REM_ADDR: 1042 case SCTP_BINDX_REM_ADDR:
1046 err = sctp_bindx_rem(sk, addr !! 1043 err = sctp_bindx_rem(sk, kaddrs, addrcnt);
1047 if (err) 1044 if (err)
1048 return err; !! 1045 goto out;
1049 return sctp_send_asconf_del_i !! 1046 err = sctp_send_asconf_del_ip(sk, kaddrs, addrcnt);
>> 1047 break;
1050 1048
1051 default: 1049 default:
1052 return -EINVAL; !! 1050 err = -EINVAL;
>> 1051 break;
1053 } 1052 }
1054 } <<
1055 1053
1056 static int sctp_bind_add(struct sock *sk, str !! 1054 out:
1057 int addrlen) !! 1055 kfree(kaddrs);
1058 { <<
1059 int err; <<
1060 1056
1061 lock_sock(sk); <<
1062 err = sctp_setsockopt_bindx(sk, addrs <<
1063 release_sock(sk); <<
1064 return err; 1057 return err;
1065 } 1058 }
1066 1059
1067 static int sctp_connect_new_asoc(struct sctp_ 1060 static int sctp_connect_new_asoc(struct sctp_endpoint *ep,
1068 const union 1061 const union sctp_addr *daddr,
1069 const struct 1062 const struct sctp_initmsg *init,
1070 struct sctp_ 1063 struct sctp_transport **tp)
1071 { 1064 {
1072 struct sctp_association *asoc; 1065 struct sctp_association *asoc;
1073 struct sock *sk = ep->base.sk; 1066 struct sock *sk = ep->base.sk;
1074 struct net *net = sock_net(sk); 1067 struct net *net = sock_net(sk);
1075 enum sctp_scope scope; 1068 enum sctp_scope scope;
1076 int err; 1069 int err;
1077 1070
1078 if (sctp_endpoint_is_peeled_off(ep, d 1071 if (sctp_endpoint_is_peeled_off(ep, daddr))
1079 return -EADDRNOTAVAIL; 1072 return -EADDRNOTAVAIL;
1080 1073
1081 if (!ep->base.bind_addr.port) { 1074 if (!ep->base.bind_addr.port) {
1082 if (sctp_autobind(sk)) 1075 if (sctp_autobind(sk))
1083 return -EAGAIN; 1076 return -EAGAIN;
1084 } else { 1077 } else {
1085 if (inet_port_requires_bind_s 1078 if (inet_port_requires_bind_service(net, ep->base.bind_addr.port) &&
1086 !ns_capable(net->user_ns, 1079 !ns_capable(net->user_ns, CAP_NET_BIND_SERVICE))
1087 return -EACCES; 1080 return -EACCES;
1088 } 1081 }
1089 1082
1090 scope = sctp_scope(daddr); 1083 scope = sctp_scope(daddr);
1091 asoc = sctp_association_new(ep, sk, s 1084 asoc = sctp_association_new(ep, sk, scope, GFP_KERNEL);
1092 if (!asoc) 1085 if (!asoc)
1093 return -ENOMEM; 1086 return -ENOMEM;
1094 1087
1095 err = sctp_assoc_set_bind_addr_from_e 1088 err = sctp_assoc_set_bind_addr_from_ep(asoc, scope, GFP_KERNEL);
1096 if (err < 0) 1089 if (err < 0)
1097 goto free; 1090 goto free;
1098 1091
1099 *tp = sctp_assoc_add_peer(asoc, daddr 1092 *tp = sctp_assoc_add_peer(asoc, daddr, GFP_KERNEL, SCTP_UNKNOWN);
1100 if (!*tp) { 1093 if (!*tp) {
1101 err = -ENOMEM; 1094 err = -ENOMEM;
1102 goto free; 1095 goto free;
1103 } 1096 }
1104 1097
1105 if (!init) 1098 if (!init)
1106 return 0; 1099 return 0;
1107 1100
1108 if (init->sinit_num_ostreams) { 1101 if (init->sinit_num_ostreams) {
1109 __u16 outcnt = init->sinit_nu 1102 __u16 outcnt = init->sinit_num_ostreams;
1110 1103
1111 asoc->c.sinit_num_ostreams = 1104 asoc->c.sinit_num_ostreams = outcnt;
1112 /* outcnt has been changed, n 1105 /* outcnt has been changed, need to re-init stream */
1113 err = sctp_stream_init(&asoc- 1106 err = sctp_stream_init(&asoc->stream, outcnt, 0, GFP_KERNEL);
1114 if (err) 1107 if (err)
1115 goto free; 1108 goto free;
1116 } 1109 }
1117 1110
1118 if (init->sinit_max_instreams) 1111 if (init->sinit_max_instreams)
1119 asoc->c.sinit_max_instreams = 1112 asoc->c.sinit_max_instreams = init->sinit_max_instreams;
1120 1113
1121 if (init->sinit_max_attempts) 1114 if (init->sinit_max_attempts)
1122 asoc->max_init_attempts = ini 1115 asoc->max_init_attempts = init->sinit_max_attempts;
1123 1116
1124 if (init->sinit_max_init_timeo) 1117 if (init->sinit_max_init_timeo)
1125 asoc->max_init_timeo = 1118 asoc->max_init_timeo =
1126 msecs_to_jiffies(init 1119 msecs_to_jiffies(init->sinit_max_init_timeo);
1127 1120
1128 return 0; 1121 return 0;
1129 free: 1122 free:
1130 sctp_association_free(asoc); 1123 sctp_association_free(asoc);
1131 return err; 1124 return err;
1132 } 1125 }
1133 1126
1134 static int sctp_connect_add_peer(struct sctp_ 1127 static int sctp_connect_add_peer(struct sctp_association *asoc,
1135 union sctp_a 1128 union sctp_addr *daddr, int addr_len)
1136 { 1129 {
1137 struct sctp_endpoint *ep = asoc->ep; 1130 struct sctp_endpoint *ep = asoc->ep;
1138 struct sctp_association *old; 1131 struct sctp_association *old;
1139 struct sctp_transport *t; 1132 struct sctp_transport *t;
1140 int err; 1133 int err;
1141 1134
1142 err = sctp_verify_addr(ep->base.sk, d 1135 err = sctp_verify_addr(ep->base.sk, daddr, addr_len);
1143 if (err) 1136 if (err)
1144 return err; 1137 return err;
1145 1138
1146 old = sctp_endpoint_lookup_assoc(ep, 1139 old = sctp_endpoint_lookup_assoc(ep, daddr, &t);
1147 if (old && old != asoc) 1140 if (old && old != asoc)
1148 return old->state >= SCTP_STA 1141 return old->state >= SCTP_STATE_ESTABLISHED ? -EISCONN
1149 1142 : -EALREADY;
1150 1143
1151 if (sctp_endpoint_is_peeled_off(ep, d 1144 if (sctp_endpoint_is_peeled_off(ep, daddr))
1152 return -EADDRNOTAVAIL; 1145 return -EADDRNOTAVAIL;
1153 1146
1154 t = sctp_assoc_add_peer(asoc, daddr, 1147 t = sctp_assoc_add_peer(asoc, daddr, GFP_KERNEL, SCTP_UNKNOWN);
1155 if (!t) 1148 if (!t)
1156 return -ENOMEM; 1149 return -ENOMEM;
1157 1150
1158 return 0; 1151 return 0;
1159 } 1152 }
1160 1153
1161 /* __sctp_connect(struct sock* sk, struct soc 1154 /* __sctp_connect(struct sock* sk, struct sockaddr *kaddrs, int addrs_size)
1162 * 1155 *
1163 * Common routine for handling connect() and 1156 * Common routine for handling connect() and sctp_connectx().
1164 * Connect will come in with just a single ad 1157 * Connect will come in with just a single address.
1165 */ 1158 */
1166 static int __sctp_connect(struct sock *sk, st 1159 static int __sctp_connect(struct sock *sk, struct sockaddr *kaddrs,
1167 int addrs_size, int 1160 int addrs_size, int flags, sctp_assoc_t *assoc_id)
1168 { 1161 {
1169 struct sctp_sock *sp = sctp_sk(sk); 1162 struct sctp_sock *sp = sctp_sk(sk);
1170 struct sctp_endpoint *ep = sp->ep; 1163 struct sctp_endpoint *ep = sp->ep;
1171 struct sctp_transport *transport; 1164 struct sctp_transport *transport;
1172 struct sctp_association *asoc; 1165 struct sctp_association *asoc;
1173 void *addr_buf = kaddrs; 1166 void *addr_buf = kaddrs;
1174 union sctp_addr *daddr; 1167 union sctp_addr *daddr;
1175 struct sctp_af *af; 1168 struct sctp_af *af;
1176 int walk_size, err; 1169 int walk_size, err;
1177 long timeo; 1170 long timeo;
1178 1171
1179 if (sctp_sstate(sk, ESTABLISHED) || s 1172 if (sctp_sstate(sk, ESTABLISHED) || sctp_sstate(sk, CLOSING) ||
1180 (sctp_style(sk, TCP) && sctp_ssta 1173 (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING)))
1181 return -EISCONN; 1174 return -EISCONN;
1182 1175
1183 daddr = addr_buf; 1176 daddr = addr_buf;
1184 af = sctp_get_af_specific(daddr->sa.s 1177 af = sctp_get_af_specific(daddr->sa.sa_family);
1185 if (!af || af->sockaddr_len > addrs_s 1178 if (!af || af->sockaddr_len > addrs_size)
1186 return -EINVAL; 1179 return -EINVAL;
1187 1180
1188 err = sctp_verify_addr(sk, daddr, af- 1181 err = sctp_verify_addr(sk, daddr, af->sockaddr_len);
1189 if (err) 1182 if (err)
1190 return err; 1183 return err;
1191 1184
1192 asoc = sctp_endpoint_lookup_assoc(ep, 1185 asoc = sctp_endpoint_lookup_assoc(ep, daddr, &transport);
1193 if (asoc) 1186 if (asoc)
1194 return asoc->state >= SCTP_ST 1187 return asoc->state >= SCTP_STATE_ESTABLISHED ? -EISCONN
1195 1188 : -EALREADY;
1196 1189
1197 err = sctp_connect_new_asoc(ep, daddr 1190 err = sctp_connect_new_asoc(ep, daddr, NULL, &transport);
1198 if (err) 1191 if (err)
1199 return err; 1192 return err;
1200 asoc = transport->asoc; 1193 asoc = transport->asoc;
1201 1194
1202 addr_buf += af->sockaddr_len; 1195 addr_buf += af->sockaddr_len;
1203 walk_size = af->sockaddr_len; 1196 walk_size = af->sockaddr_len;
1204 while (walk_size < addrs_size) { 1197 while (walk_size < addrs_size) {
1205 err = -EINVAL; 1198 err = -EINVAL;
1206 if (walk_size + sizeof(sa_fam 1199 if (walk_size + sizeof(sa_family_t) > addrs_size)
1207 goto out_free; 1200 goto out_free;
1208 1201
1209 daddr = addr_buf; 1202 daddr = addr_buf;
1210 af = sctp_get_af_specific(dad 1203 af = sctp_get_af_specific(daddr->sa.sa_family);
1211 if (!af || af->sockaddr_len + 1204 if (!af || af->sockaddr_len + walk_size > addrs_size)
1212 goto out_free; 1205 goto out_free;
1213 1206
1214 if (asoc->peer.port != ntohs( 1207 if (asoc->peer.port != ntohs(daddr->v4.sin_port))
1215 goto out_free; 1208 goto out_free;
1216 1209
1217 err = sctp_connect_add_peer(a 1210 err = sctp_connect_add_peer(asoc, daddr, af->sockaddr_len);
1218 if (err) 1211 if (err)
1219 goto out_free; 1212 goto out_free;
1220 1213
1221 addr_buf += af->sockaddr_len 1214 addr_buf += af->sockaddr_len;
1222 walk_size += af->sockaddr_len 1215 walk_size += af->sockaddr_len;
1223 } 1216 }
1224 1217
1225 /* In case the user of sctp_connectx( 1218 /* In case the user of sctp_connectx() wants an association
1226 * id back, assign one now. 1219 * id back, assign one now.
1227 */ 1220 */
1228 if (assoc_id) { 1221 if (assoc_id) {
1229 err = sctp_assoc_set_id(asoc, 1222 err = sctp_assoc_set_id(asoc, GFP_KERNEL);
1230 if (err < 0) 1223 if (err < 0)
1231 goto out_free; 1224 goto out_free;
1232 } 1225 }
1233 1226
1234 err = sctp_primitive_ASSOCIATE(sock_n 1227 err = sctp_primitive_ASSOCIATE(sock_net(sk), asoc, NULL);
1235 if (err < 0) 1228 if (err < 0)
1236 goto out_free; 1229 goto out_free;
1237 1230
1238 /* Initialize sk's dport and daddr fo 1231 /* Initialize sk's dport and daddr for getpeername() */
1239 inet_sk(sk)->inet_dport = htons(asoc- 1232 inet_sk(sk)->inet_dport = htons(asoc->peer.port);
1240 sp->pf->to_sk_daddr(daddr, sk); 1233 sp->pf->to_sk_daddr(daddr, sk);
1241 sk->sk_err = 0; 1234 sk->sk_err = 0;
1242 1235
1243 if (assoc_id) 1236 if (assoc_id)
1244 *assoc_id = asoc->assoc_id; 1237 *assoc_id = asoc->assoc_id;
1245 1238
1246 timeo = sock_sndtimeo(sk, flags & O_N 1239 timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
1247 return sctp_wait_for_connect(asoc, &t 1240 return sctp_wait_for_connect(asoc, &timeo);
1248 1241
1249 out_free: 1242 out_free:
1250 pr_debug("%s: took out_free path with 1243 pr_debug("%s: took out_free path with asoc:%p kaddrs:%p err:%d\n",
1251 __func__, asoc, kaddrs, err) 1244 __func__, asoc, kaddrs, err);
1252 sctp_association_free(asoc); 1245 sctp_association_free(asoc);
1253 return err; 1246 return err;
1254 } 1247 }
1255 1248
1256 /* Helper for tunneling sctp_connectx() reque 1249 /* Helper for tunneling sctp_connectx() requests through sctp_setsockopt()
1257 * 1250 *
1258 * API 8.9 1251 * API 8.9
1259 * int sctp_connectx(int sd, struct sockaddr 1252 * int sctp_connectx(int sd, struct sockaddr *addrs, int addrcnt,
1260 * sctp_assoc_t *asoc); 1253 * sctp_assoc_t *asoc);
1261 * 1254 *
1262 * If sd is an IPv4 socket, the addresses pas 1255 * If sd is an IPv4 socket, the addresses passed must be IPv4 addresses.
1263 * If the sd is an IPv6 socket, the addresses 1256 * If the sd is an IPv6 socket, the addresses passed can either be IPv4
1264 * or IPv6 addresses. 1257 * or IPv6 addresses.
1265 * 1258 *
1266 * A single address may be specified as INADD 1259 * A single address may be specified as INADDR_ANY or IN6ADDR_ANY, see
1267 * Section 3.1.2 for this usage. 1260 * Section 3.1.2 for this usage.
1268 * 1261 *
1269 * addrs is a pointer to an array of one or m 1262 * addrs is a pointer to an array of one or more socket addresses. Each
1270 * address is contained in its appropriate st 1263 * address is contained in its appropriate structure (i.e. struct
1271 * sockaddr_in or struct sockaddr_in6) the fa 1264 * sockaddr_in or struct sockaddr_in6) the family of the address type
1272 * must be used to distengish the address len 1265 * must be used to distengish the address length (note that this
1273 * representation is termed a "packed array" 1266 * representation is termed a "packed array" of addresses). The caller
1274 * specifies the number of addresses in the a 1267 * specifies the number of addresses in the array with addrcnt.
1275 * 1268 *
1276 * On success, sctp_connectx() returns 0. It 1269 * On success, sctp_connectx() returns 0. It also sets the assoc_id to
1277 * the association id of the new association. 1270 * the association id of the new association. On failure, sctp_connectx()
1278 * returns -1, and sets errno to the appropri 1271 * returns -1, and sets errno to the appropriate error code. The assoc_id
1279 * is not touched by the kernel. 1272 * is not touched by the kernel.
1280 * 1273 *
1281 * For SCTP, the port given in each socket ad 1274 * For SCTP, the port given in each socket address must be the same, or
1282 * sctp_connectx() will fail, setting errno t 1275 * sctp_connectx() will fail, setting errno to EINVAL.
1283 * 1276 *
1284 * An application can use sctp_connectx to in 1277 * An application can use sctp_connectx to initiate an association with
1285 * an endpoint that is multi-homed. Much lik 1278 * an endpoint that is multi-homed. Much like sctp_bindx() this call
1286 * allows a caller to specify multiple addres 1279 * allows a caller to specify multiple addresses at which a peer can be
1287 * reached. The way the SCTP stack uses the 1280 * reached. The way the SCTP stack uses the list of addresses to set up
1288 * the association is implementation dependen 1281 * the association is implementation dependent. This function only
1289 * specifies that the stack will try to make 1282 * specifies that the stack will try to make use of all the addresses in
1290 * the list when needed. 1283 * the list when needed.
1291 * 1284 *
1292 * Note that the list of addresses passed in 1285 * Note that the list of addresses passed in is only used for setting up
1293 * the association. It does not necessarily 1286 * the association. It does not necessarily equal the set of addresses
1294 * the peer uses for the resulting associatio 1287 * the peer uses for the resulting association. If the caller wants to
1295 * find out the set of peer addresses, it mus 1288 * find out the set of peer addresses, it must use sctp_getpaddrs() to
1296 * retrieve them after the association has be 1289 * retrieve them after the association has been set up.
1297 * 1290 *
1298 * Basically do nothing but copying the addre 1291 * Basically do nothing but copying the addresses from user to kernel
1299 * land and invoking either sctp_connectx(). 1292 * land and invoking either sctp_connectx(). This is used for tunneling
1300 * the sctp_connectx() request through sctp_s 1293 * the sctp_connectx() request through sctp_setsockopt() from userspace.
1301 * 1294 *
1302 * On exit there is no need to do sockfd_put( 1295 * On exit there is no need to do sockfd_put(), sys_setsockopt() does
1303 * it. 1296 * it.
1304 * 1297 *
1305 * sk The sk of the socket 1298 * sk The sk of the socket
1306 * addrs The pointer to the addresses !! 1299 * addrs The pointer to the addresses in user land
1307 * addrssize Size of the addrs buffer 1300 * addrssize Size of the addrs buffer
1308 * 1301 *
1309 * Returns >=0 if ok, <0 errno code on error. 1302 * Returns >=0 if ok, <0 errno code on error.
1310 */ 1303 */
1311 static int __sctp_setsockopt_connectx(struct !! 1304 static int __sctp_setsockopt_connectx(struct sock *sk,
1312 int add !! 1305 struct sockaddr __user *addrs,
>> 1306 int addrs_size,
>> 1307 sctp_assoc_t *assoc_id)
1313 { 1308 {
>> 1309 struct sockaddr *kaddrs;
1314 int err = 0, flags = 0; 1310 int err = 0, flags = 0;
1315 1311
1316 pr_debug("%s: sk:%p addrs:%p addrs_si 1312 pr_debug("%s: sk:%p addrs:%p addrs_size:%d\n",
1317 __func__, sk, kaddrs, addrs_ !! 1313 __func__, sk, addrs, addrs_size);
1318 1314
1319 /* make sure the 1st addr's sa_family 1315 /* make sure the 1st addr's sa_family is accessible later */
1320 if (unlikely(addrs_size < sizeof(sa_f 1316 if (unlikely(addrs_size < sizeof(sa_family_t)))
1321 return -EINVAL; 1317 return -EINVAL;
1322 1318
>> 1319 kaddrs = memdup_user(addrs, addrs_size);
>> 1320 if (IS_ERR(kaddrs))
>> 1321 return PTR_ERR(kaddrs);
>> 1322
1323 /* Allow security module to validate 1323 /* Allow security module to validate connectx addresses. */
1324 err = security_sctp_bind_connect(sk, 1324 err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_CONNECTX,
1325 (str 1325 (struct sockaddr *)kaddrs,
1326 add 1326 addrs_size);
1327 if (err) 1327 if (err)
1328 return err; !! 1328 goto out_free;
1329 1329
1330 /* in-kernel sockets don't generally 1330 /* in-kernel sockets don't generally have a file allocated to them
1331 * if all they do is call sock_create 1331 * if all they do is call sock_create_kern().
1332 */ 1332 */
1333 if (sk->sk_socket->file) 1333 if (sk->sk_socket->file)
1334 flags = sk->sk_socket->file-> 1334 flags = sk->sk_socket->file->f_flags;
1335 1335
1336 return __sctp_connect(sk, kaddrs, add !! 1336 err = __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
>> 1337
>> 1338 out_free:
>> 1339 kfree(kaddrs);
>> 1340
>> 1341 return err;
1337 } 1342 }
1338 1343
1339 /* 1344 /*
1340 * This is an older interface. It's kept for 1345 * This is an older interface. It's kept for backward compatibility
1341 * to the option that doesn't provide associa 1346 * to the option that doesn't provide association id.
1342 */ 1347 */
1343 static int sctp_setsockopt_connectx_old(struc 1348 static int sctp_setsockopt_connectx_old(struct sock *sk,
1344 struc !! 1349 struct sockaddr __user *addrs,
1345 int a 1350 int addrs_size)
1346 { 1351 {
1347 return __sctp_setsockopt_connectx(sk, !! 1352 return __sctp_setsockopt_connectx(sk, addrs, addrs_size, NULL);
1348 } 1353 }
1349 1354
1350 /* 1355 /*
1351 * New interface for the API. The since the 1356 * New interface for the API. The since the API is done with a socket
1352 * option, to make it simple we feed back the 1357 * option, to make it simple we feed back the association id is as a return
1353 * indication to the call. Error is always n 1358 * indication to the call. Error is always negative and association id is
1354 * always positive. 1359 * always positive.
1355 */ 1360 */
1356 static int sctp_setsockopt_connectx(struct so 1361 static int sctp_setsockopt_connectx(struct sock *sk,
1357 struct so !! 1362 struct sockaddr __user *addrs,
1358 int addrs 1363 int addrs_size)
1359 { 1364 {
1360 sctp_assoc_t assoc_id = 0; 1365 sctp_assoc_t assoc_id = 0;
1361 int err = 0; 1366 int err = 0;
1362 1367
1363 err = __sctp_setsockopt_connectx(sk, !! 1368 err = __sctp_setsockopt_connectx(sk, addrs, addrs_size, &assoc_id);
1364 1369
1365 if (err) 1370 if (err)
1366 return err; 1371 return err;
1367 else 1372 else
1368 return assoc_id; 1373 return assoc_id;
1369 } 1374 }
1370 1375
1371 /* 1376 /*
1372 * New (hopefully final) interface for the AP 1377 * New (hopefully final) interface for the API.
1373 * We use the sctp_getaddrs_old structure so 1378 * We use the sctp_getaddrs_old structure so that use-space library
1374 * can avoid any unnecessary allocations. The 1379 * can avoid any unnecessary allocations. The only different part
1375 * is that we store the actual length of the 1380 * is that we store the actual length of the address buffer into the
1376 * addrs_num structure member. That way we ca 1381 * addrs_num structure member. That way we can re-use the existing
1377 * code. 1382 * code.
1378 */ 1383 */
1379 #ifdef CONFIG_COMPAT 1384 #ifdef CONFIG_COMPAT
1380 struct compat_sctp_getaddrs_old { 1385 struct compat_sctp_getaddrs_old {
1381 sctp_assoc_t assoc_id; 1386 sctp_assoc_t assoc_id;
1382 s32 addr_num; 1387 s32 addr_num;
1383 compat_uptr_t addrs; /* st 1388 compat_uptr_t addrs; /* struct sockaddr * */
1384 }; 1389 };
1385 #endif 1390 #endif
1386 1391
1387 static int sctp_getsockopt_connectx3(struct s 1392 static int sctp_getsockopt_connectx3(struct sock *sk, int len,
1388 char __u 1393 char __user *optval,
1389 int __us 1394 int __user *optlen)
1390 { 1395 {
1391 struct sctp_getaddrs_old param; 1396 struct sctp_getaddrs_old param;
1392 sctp_assoc_t assoc_id = 0; 1397 sctp_assoc_t assoc_id = 0;
1393 struct sockaddr *kaddrs; <<
1394 int err = 0; 1398 int err = 0;
1395 1399
1396 #ifdef CONFIG_COMPAT 1400 #ifdef CONFIG_COMPAT
1397 if (in_compat_syscall()) { 1401 if (in_compat_syscall()) {
1398 struct compat_sctp_getaddrs_o 1402 struct compat_sctp_getaddrs_old param32;
1399 1403
1400 if (len < sizeof(param32)) 1404 if (len < sizeof(param32))
1401 return -EINVAL; 1405 return -EINVAL;
1402 if (copy_from_user(¶m32, 1406 if (copy_from_user(¶m32, optval, sizeof(param32)))
1403 return -EFAULT; 1407 return -EFAULT;
1404 1408
1405 param.assoc_id = param32.asso 1409 param.assoc_id = param32.assoc_id;
1406 param.addr_num = param32.addr 1410 param.addr_num = param32.addr_num;
1407 param.addrs = compat_ptr(para 1411 param.addrs = compat_ptr(param32.addrs);
1408 } else 1412 } else
1409 #endif 1413 #endif
1410 { 1414 {
1411 if (len < sizeof(param)) 1415 if (len < sizeof(param))
1412 return -EINVAL; 1416 return -EINVAL;
1413 if (copy_from_user(¶m, op 1417 if (copy_from_user(¶m, optval, sizeof(param)))
1414 return -EFAULT; 1418 return -EFAULT;
1415 } 1419 }
1416 1420
1417 kaddrs = memdup_user(param.addrs, par !! 1421 err = __sctp_setsockopt_connectx(sk, (struct sockaddr __user *)
1418 if (IS_ERR(kaddrs)) !! 1422 param.addrs, param.addr_num,
1419 return PTR_ERR(kaddrs); !! 1423 &assoc_id);
1420 <<
1421 err = __sctp_setsockopt_connectx(sk, <<
1422 kfree(kaddrs); <<
1423 if (err == 0 || err == -EINPROGRESS) 1424 if (err == 0 || err == -EINPROGRESS) {
1424 if (copy_to_user(optval, &ass 1425 if (copy_to_user(optval, &assoc_id, sizeof(assoc_id)))
1425 return -EFAULT; 1426 return -EFAULT;
1426 if (put_user(sizeof(assoc_id) 1427 if (put_user(sizeof(assoc_id), optlen))
1427 return -EFAULT; 1428 return -EFAULT;
1428 } 1429 }
1429 1430
1430 return err; 1431 return err;
1431 } 1432 }
1432 1433
1433 /* API 3.1.4 close() - UDP Style Syntax 1434 /* API 3.1.4 close() - UDP Style Syntax
1434 * Applications use close() to perform gracef 1435 * Applications use close() to perform graceful shutdown (as described in
1435 * Section 10.1 of [SCTP]) on ALL the associa 1436 * Section 10.1 of [SCTP]) on ALL the associations currently represented
1436 * by a UDP-style socket. 1437 * by a UDP-style socket.
1437 * 1438 *
1438 * The syntax is 1439 * The syntax is
1439 * 1440 *
1440 * ret = close(int sd); 1441 * ret = close(int sd);
1441 * 1442 *
1442 * sd - the socket descriptor of the a 1443 * sd - the socket descriptor of the associations to be closed.
1443 * 1444 *
1444 * To gracefully shutdown a specific associat 1445 * To gracefully shutdown a specific association represented by the
1445 * UDP-style socket, an application should us 1446 * UDP-style socket, an application should use the sendmsg() call,
1446 * passing no user data, but including the ap 1447 * passing no user data, but including the appropriate flag in the
1447 * ancillary data (see Section xxxx). 1448 * ancillary data (see Section xxxx).
1448 * 1449 *
1449 * If sd in the close() call is a branched-of 1450 * If sd in the close() call is a branched-off socket representing only
1450 * one association, the shutdown is performed 1451 * one association, the shutdown is performed on that association only.
1451 * 1452 *
1452 * 4.1.6 close() - TCP Style Syntax 1453 * 4.1.6 close() - TCP Style Syntax
1453 * 1454 *
1454 * Applications use close() to gracefully clo 1455 * Applications use close() to gracefully close down an association.
1455 * 1456 *
1456 * The syntax is: 1457 * The syntax is:
1457 * 1458 *
1458 * int close(int sd); 1459 * int close(int sd);
1459 * 1460 *
1460 * sd - the socket descriptor of th 1461 * sd - the socket descriptor of the association to be closed.
1461 * 1462 *
1462 * After an application calls close() on a so 1463 * After an application calls close() on a socket descriptor, no further
1463 * socket operations will succeed on that des 1464 * socket operations will succeed on that descriptor.
1464 * 1465 *
1465 * API 7.1.4 SO_LINGER 1466 * API 7.1.4 SO_LINGER
1466 * 1467 *
1467 * An application using the TCP-style socket 1468 * An application using the TCP-style socket can use this option to
1468 * perform the SCTP ABORT primitive. The lin 1469 * perform the SCTP ABORT primitive. The linger option structure is:
1469 * 1470 *
1470 * struct linger { 1471 * struct linger {
1471 * int l_onoff; // opt 1472 * int l_onoff; // option on/off
1472 * int l_linger; // lin 1473 * int l_linger; // linger time
1473 * }; 1474 * };
1474 * 1475 *
1475 * To enable the option, set l_onoff to 1. I 1476 * To enable the option, set l_onoff to 1. If the l_linger value is set
1476 * to 0, calling close() is the same as the A 1477 * to 0, calling close() is the same as the ABORT primitive. If the
1477 * value is set to a negative value, the sets 1478 * value is set to a negative value, the setsockopt() call will return
1478 * an error. If the value is set to a positi 1479 * an error. If the value is set to a positive value linger_time, the
1479 * close() can be blocked for at most linger_ 1480 * close() can be blocked for at most linger_time ms. If the graceful
1480 * shutdown phase does not finish during this 1481 * shutdown phase does not finish during this period, close() will
1481 * return but the graceful shutdown phase con 1482 * return but the graceful shutdown phase continues in the system.
1482 */ 1483 */
1483 static void sctp_close(struct sock *sk, long 1484 static void sctp_close(struct sock *sk, long timeout)
1484 { 1485 {
1485 struct net *net = sock_net(sk); 1486 struct net *net = sock_net(sk);
1486 struct sctp_endpoint *ep; 1487 struct sctp_endpoint *ep;
1487 struct sctp_association *asoc; 1488 struct sctp_association *asoc;
1488 struct list_head *pos, *temp; 1489 struct list_head *pos, *temp;
1489 unsigned int data_was_unread; 1490 unsigned int data_was_unread;
1490 1491
1491 pr_debug("%s: sk:%p, timeout:%ld\n", 1492 pr_debug("%s: sk:%p, timeout:%ld\n", __func__, sk, timeout);
1492 1493
1493 lock_sock_nested(sk, SINGLE_DEPTH_NES 1494 lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
1494 sk->sk_shutdown = SHUTDOWN_MASK; 1495 sk->sk_shutdown = SHUTDOWN_MASK;
1495 inet_sk_set_state(sk, SCTP_SS_CLOSING 1496 inet_sk_set_state(sk, SCTP_SS_CLOSING);
1496 1497
1497 ep = sctp_sk(sk)->ep; 1498 ep = sctp_sk(sk)->ep;
1498 1499
1499 /* Clean up any skbs sitting on the r 1500 /* Clean up any skbs sitting on the receive queue. */
1500 data_was_unread = sctp_queue_purge_ul 1501 data_was_unread = sctp_queue_purge_ulpevents(&sk->sk_receive_queue);
1501 data_was_unread += sctp_queue_purge_u 1502 data_was_unread += sctp_queue_purge_ulpevents(&sctp_sk(sk)->pd_lobby);
1502 1503
1503 /* Walk all associations on an endpoi 1504 /* Walk all associations on an endpoint. */
1504 list_for_each_safe(pos, temp, &ep->as 1505 list_for_each_safe(pos, temp, &ep->asocs) {
1505 asoc = list_entry(pos, struct 1506 asoc = list_entry(pos, struct sctp_association, asocs);
1506 1507
1507 if (sctp_style(sk, TCP)) { 1508 if (sctp_style(sk, TCP)) {
1508 /* A closed associati 1509 /* A closed association can still be in the list if
1509 * it belongs to a TC 1510 * it belongs to a TCP-style listening socket that is
1510 * not yet accepted. 1511 * not yet accepted. If so, free it. If not, send an
1511 * ABORT or SHUTDOWN 1512 * ABORT or SHUTDOWN based on the linger options.
1512 */ 1513 */
1513 if (sctp_state(asoc, 1514 if (sctp_state(asoc, CLOSED)) {
1514 sctp_associat 1515 sctp_association_free(asoc);
1515 continue; 1516 continue;
1516 } 1517 }
1517 } 1518 }
1518 1519
1519 if (data_was_unread || !skb_q 1520 if (data_was_unread || !skb_queue_empty(&asoc->ulpq.lobby) ||
1520 !skb_queue_empty(&asoc->u 1521 !skb_queue_empty(&asoc->ulpq.reasm) ||
1521 !skb_queue_empty(&asoc->u 1522 !skb_queue_empty(&asoc->ulpq.reasm_uo) ||
1522 (sock_flag(sk, SOCK_LINGE 1523 (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)) {
1523 struct sctp_chunk *ch 1524 struct sctp_chunk *chunk;
1524 1525
1525 chunk = sctp_make_abo 1526 chunk = sctp_make_abort_user(asoc, NULL, 0);
1526 sctp_primitive_ABORT( 1527 sctp_primitive_ABORT(net, asoc, chunk);
1527 } else 1528 } else
1528 sctp_primitive_SHUTDO 1529 sctp_primitive_SHUTDOWN(net, asoc, NULL);
1529 } 1530 }
1530 1531
1531 /* On a TCP-style socket, block for a 1532 /* On a TCP-style socket, block for at most linger_time if set. */
1532 if (sctp_style(sk, TCP) && timeout) 1533 if (sctp_style(sk, TCP) && timeout)
1533 sctp_wait_for_close(sk, timeo 1534 sctp_wait_for_close(sk, timeout);
1534 1535
1535 /* This will run the backlog queue. 1536 /* This will run the backlog queue. */
1536 release_sock(sk); 1537 release_sock(sk);
1537 1538
1538 /* Supposedly, no process has access 1539 /* Supposedly, no process has access to the socket, but
1539 * the net layers still may. 1540 * the net layers still may.
1540 * Also, sctp_destroy_sock() needs to 1541 * Also, sctp_destroy_sock() needs to be called with addr_wq_lock
1541 * held and that should be grabbed be 1542 * held and that should be grabbed before socket lock.
1542 */ 1543 */
1543 spin_lock_bh(&net->sctp.addr_wq_lock) 1544 spin_lock_bh(&net->sctp.addr_wq_lock);
1544 bh_lock_sock_nested(sk); 1545 bh_lock_sock_nested(sk);
1545 1546
1546 /* Hold the sock, since sk_common_rel 1547 /* Hold the sock, since sk_common_release() will put sock_put()
1547 * and we have just a little more cle 1548 * and we have just a little more cleanup.
1548 */ 1549 */
1549 sock_hold(sk); 1550 sock_hold(sk);
1550 sk_common_release(sk); 1551 sk_common_release(sk);
1551 1552
1552 bh_unlock_sock(sk); 1553 bh_unlock_sock(sk);
1553 spin_unlock_bh(&net->sctp.addr_wq_loc 1554 spin_unlock_bh(&net->sctp.addr_wq_lock);
1554 1555
1555 sock_put(sk); 1556 sock_put(sk);
1556 1557
1557 SCTP_DBG_OBJCNT_DEC(sock); 1558 SCTP_DBG_OBJCNT_DEC(sock);
1558 } 1559 }
1559 1560
1560 /* Handle EPIPE error. */ 1561 /* Handle EPIPE error. */
1561 static int sctp_error(struct sock *sk, int fl 1562 static int sctp_error(struct sock *sk, int flags, int err)
1562 { 1563 {
1563 if (err == -EPIPE) 1564 if (err == -EPIPE)
1564 err = sock_error(sk) ? : -EPI 1565 err = sock_error(sk) ? : -EPIPE;
1565 if (err == -EPIPE && !(flags & MSG_NO 1566 if (err == -EPIPE && !(flags & MSG_NOSIGNAL))
1566 send_sig(SIGPIPE, current, 0) 1567 send_sig(SIGPIPE, current, 0);
1567 return err; 1568 return err;
1568 } 1569 }
1569 1570
1570 /* API 3.1.3 sendmsg() - UDP Style Syntax 1571 /* API 3.1.3 sendmsg() - UDP Style Syntax
1571 * 1572 *
1572 * An application uses sendmsg() and recvmsg( 1573 * An application uses sendmsg() and recvmsg() calls to transmit data to
1573 * and receive data from its peer. 1574 * and receive data from its peer.
1574 * 1575 *
1575 * ssize_t sendmsg(int socket, const struct 1576 * ssize_t sendmsg(int socket, const struct msghdr *message,
1576 * int flags); 1577 * int flags);
1577 * 1578 *
1578 * socket - the socket descriptor of the en 1579 * socket - the socket descriptor of the endpoint.
1579 * message - pointer to the msghdr structure 1580 * message - pointer to the msghdr structure which contains a single
1580 * user message and possibly some 1581 * user message and possibly some ancillary data.
1581 * 1582 *
1582 * See Section 5 for complete desc 1583 * See Section 5 for complete description of the data
1583 * structures. 1584 * structures.
1584 * 1585 *
1585 * flags - flags sent or received with the 1586 * flags - flags sent or received with the user message, see Section
1586 * 5 for complete description of t 1587 * 5 for complete description of the flags.
1587 * 1588 *
1588 * Note: This function could use a rewrite e 1589 * Note: This function could use a rewrite especially when explicit
1589 * connect support comes in. 1590 * connect support comes in.
1590 */ 1591 */
1591 /* BUG: We do not implement the equivalent o 1592 /* BUG: We do not implement the equivalent of sk_stream_wait_memory(). */
1592 1593
1593 static int sctp_msghdr_parse(const struct msg 1594 static int sctp_msghdr_parse(const struct msghdr *msg,
1594 struct sctp_cmsg 1595 struct sctp_cmsgs *cmsgs);
1595 1596
1596 static int sctp_sendmsg_parse(struct sock *sk 1597 static int sctp_sendmsg_parse(struct sock *sk, struct sctp_cmsgs *cmsgs,
1597 struct sctp_snd 1598 struct sctp_sndrcvinfo *srinfo,
1598 const struct ms 1599 const struct msghdr *msg, size_t msg_len)
1599 { 1600 {
1600 __u16 sflags; 1601 __u16 sflags;
1601 int err; 1602 int err;
1602 1603
1603 if (sctp_sstate(sk, LISTENING) && sct 1604 if (sctp_sstate(sk, LISTENING) && sctp_style(sk, TCP))
1604 return -EPIPE; 1605 return -EPIPE;
1605 1606
1606 if (msg_len > sk->sk_sndbuf) 1607 if (msg_len > sk->sk_sndbuf)
1607 return -EMSGSIZE; 1608 return -EMSGSIZE;
1608 1609
1609 memset(cmsgs, 0, sizeof(*cmsgs)); 1610 memset(cmsgs, 0, sizeof(*cmsgs));
1610 err = sctp_msghdr_parse(msg, cmsgs); 1611 err = sctp_msghdr_parse(msg, cmsgs);
1611 if (err) { 1612 if (err) {
1612 pr_debug("%s: msghdr parse er 1613 pr_debug("%s: msghdr parse err:%x\n", __func__, err);
1613 return err; 1614 return err;
1614 } 1615 }
1615 1616
1616 memset(srinfo, 0, sizeof(*srinfo)); 1617 memset(srinfo, 0, sizeof(*srinfo));
1617 if (cmsgs->srinfo) { 1618 if (cmsgs->srinfo) {
1618 srinfo->sinfo_stream = cmsgs- 1619 srinfo->sinfo_stream = cmsgs->srinfo->sinfo_stream;
1619 srinfo->sinfo_flags = cmsgs-> 1620 srinfo->sinfo_flags = cmsgs->srinfo->sinfo_flags;
1620 srinfo->sinfo_ppid = cmsgs->s 1621 srinfo->sinfo_ppid = cmsgs->srinfo->sinfo_ppid;
1621 srinfo->sinfo_context = cmsgs 1622 srinfo->sinfo_context = cmsgs->srinfo->sinfo_context;
1622 srinfo->sinfo_assoc_id = cmsg 1623 srinfo->sinfo_assoc_id = cmsgs->srinfo->sinfo_assoc_id;
1623 srinfo->sinfo_timetolive = cm 1624 srinfo->sinfo_timetolive = cmsgs->srinfo->sinfo_timetolive;
1624 } 1625 }
1625 1626
1626 if (cmsgs->sinfo) { 1627 if (cmsgs->sinfo) {
1627 srinfo->sinfo_stream = cmsgs- 1628 srinfo->sinfo_stream = cmsgs->sinfo->snd_sid;
1628 srinfo->sinfo_flags = cmsgs-> 1629 srinfo->sinfo_flags = cmsgs->sinfo->snd_flags;
1629 srinfo->sinfo_ppid = cmsgs->s 1630 srinfo->sinfo_ppid = cmsgs->sinfo->snd_ppid;
1630 srinfo->sinfo_context = cmsgs 1631 srinfo->sinfo_context = cmsgs->sinfo->snd_context;
1631 srinfo->sinfo_assoc_id = cmsg 1632 srinfo->sinfo_assoc_id = cmsgs->sinfo->snd_assoc_id;
1632 } 1633 }
1633 1634
1634 if (cmsgs->prinfo) { 1635 if (cmsgs->prinfo) {
1635 srinfo->sinfo_timetolive = cm 1636 srinfo->sinfo_timetolive = cmsgs->prinfo->pr_value;
1636 SCTP_PR_SET_POLICY(srinfo->si 1637 SCTP_PR_SET_POLICY(srinfo->sinfo_flags,
1637 cmsgs->pri 1638 cmsgs->prinfo->pr_policy);
1638 } 1639 }
1639 1640
1640 sflags = srinfo->sinfo_flags; 1641 sflags = srinfo->sinfo_flags;
1641 if (!sflags && msg_len) 1642 if (!sflags && msg_len)
1642 return 0; 1643 return 0;
1643 1644
1644 if (sctp_style(sk, TCP) && (sflags & 1645 if (sctp_style(sk, TCP) && (sflags & (SCTP_EOF | SCTP_ABORT)))
1645 return -EINVAL; 1646 return -EINVAL;
1646 1647
1647 if (((sflags & SCTP_EOF) && msg_len > 1648 if (((sflags & SCTP_EOF) && msg_len > 0) ||
1648 (!(sflags & (SCTP_EOF | SCTP_ABOR 1649 (!(sflags & (SCTP_EOF | SCTP_ABORT)) && msg_len == 0))
1649 return -EINVAL; 1650 return -EINVAL;
1650 1651
1651 if ((sflags & SCTP_ADDR_OVER) && !msg 1652 if ((sflags & SCTP_ADDR_OVER) && !msg->msg_name)
1652 return -EINVAL; 1653 return -EINVAL;
1653 1654
1654 return 0; 1655 return 0;
1655 } 1656 }
1656 1657
1657 static int sctp_sendmsg_new_asoc(struct sock 1658 static int sctp_sendmsg_new_asoc(struct sock *sk, __u16 sflags,
1658 struct sctp_ 1659 struct sctp_cmsgs *cmsgs,
1659 union sctp_a 1660 union sctp_addr *daddr,
1660 struct sctp_ 1661 struct sctp_transport **tp)
1661 { 1662 {
1662 struct sctp_endpoint *ep = sctp_sk(sk 1663 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
1663 struct sctp_association *asoc; 1664 struct sctp_association *asoc;
1664 struct cmsghdr *cmsg; 1665 struct cmsghdr *cmsg;
1665 __be32 flowinfo = 0; 1666 __be32 flowinfo = 0;
1666 struct sctp_af *af; 1667 struct sctp_af *af;
1667 int err; 1668 int err;
1668 1669
1669 *tp = NULL; 1670 *tp = NULL;
1670 1671
1671 if (sflags & (SCTP_EOF | SCTP_ABORT)) 1672 if (sflags & (SCTP_EOF | SCTP_ABORT))
1672 return -EINVAL; 1673 return -EINVAL;
1673 1674
1674 if (sctp_style(sk, TCP) && (sctp_ssta 1675 if (sctp_style(sk, TCP) && (sctp_sstate(sk, ESTABLISHED) ||
1675 sctp_ssta 1676 sctp_sstate(sk, CLOSING)))
1676 return -EADDRNOTAVAIL; 1677 return -EADDRNOTAVAIL;
1677 1678
1678 /* Label connection socket for first 1679 /* Label connection socket for first association 1-to-many
1679 * style for client sequence socket() 1680 * style for client sequence socket()->sendmsg(). This
1680 * needs to be done before sctp_assoc 1681 * needs to be done before sctp_assoc_add_peer() as that will
1681 * set up the initial packet that nee 1682 * set up the initial packet that needs to account for any
1682 * security ip options (CIPSO/CALIPSO 1683 * security ip options (CIPSO/CALIPSO) added to the packet.
1683 */ 1684 */
1684 af = sctp_get_af_specific(daddr->sa.s 1685 af = sctp_get_af_specific(daddr->sa.sa_family);
1685 if (!af) 1686 if (!af)
1686 return -EINVAL; 1687 return -EINVAL;
1687 err = security_sctp_bind_connect(sk, 1688 err = security_sctp_bind_connect(sk, SCTP_SENDMSG_CONNECT,
1688 (str 1689 (struct sockaddr *)daddr,
1689 af-> 1690 af->sockaddr_len);
1690 if (err < 0) 1691 if (err < 0)
1691 return err; 1692 return err;
1692 1693
1693 err = sctp_connect_new_asoc(ep, daddr 1694 err = sctp_connect_new_asoc(ep, daddr, cmsgs->init, tp);
1694 if (err) 1695 if (err)
1695 return err; 1696 return err;
1696 asoc = (*tp)->asoc; 1697 asoc = (*tp)->asoc;
1697 1698
1698 if (!cmsgs->addrs_msg) 1699 if (!cmsgs->addrs_msg)
1699 return 0; 1700 return 0;
1700 1701
1701 if (daddr->sa.sa_family == AF_INET6) 1702 if (daddr->sa.sa_family == AF_INET6)
1702 flowinfo = daddr->v6.sin6_flo 1703 flowinfo = daddr->v6.sin6_flowinfo;
1703 1704
1704 /* sendv addr list parse */ 1705 /* sendv addr list parse */
1705 for_each_cmsghdr(cmsg, cmsgs->addrs_m 1706 for_each_cmsghdr(cmsg, cmsgs->addrs_msg) {
1706 union sctp_addr _daddr; 1707 union sctp_addr _daddr;
1707 int dlen; 1708 int dlen;
1708 1709
1709 if (cmsg->cmsg_level != IPPRO 1710 if (cmsg->cmsg_level != IPPROTO_SCTP ||
1710 (cmsg->cmsg_type != SCTP_ 1711 (cmsg->cmsg_type != SCTP_DSTADDRV4 &&
1711 cmsg->cmsg_type != SCTP_ 1712 cmsg->cmsg_type != SCTP_DSTADDRV6))
1712 continue; 1713 continue;
1713 1714
1714 daddr = &_daddr; 1715 daddr = &_daddr;
1715 memset(daddr, 0, sizeof(*dadd 1716 memset(daddr, 0, sizeof(*daddr));
1716 dlen = cmsg->cmsg_len - sizeo 1717 dlen = cmsg->cmsg_len - sizeof(struct cmsghdr);
1717 if (cmsg->cmsg_type == SCTP_D 1718 if (cmsg->cmsg_type == SCTP_DSTADDRV4) {
1718 if (dlen < sizeof(str 1719 if (dlen < sizeof(struct in_addr)) {
1719 err = -EINVAL 1720 err = -EINVAL;
1720 goto free; 1721 goto free;
1721 } 1722 }
1722 1723
1723 dlen = sizeof(struct 1724 dlen = sizeof(struct in_addr);
1724 daddr->v4.sin_family 1725 daddr->v4.sin_family = AF_INET;
1725 daddr->v4.sin_port = 1726 daddr->v4.sin_port = htons(asoc->peer.port);
1726 memcpy(&daddr->v4.sin 1727 memcpy(&daddr->v4.sin_addr, CMSG_DATA(cmsg), dlen);
1727 } else { 1728 } else {
1728 if (dlen < sizeof(str 1729 if (dlen < sizeof(struct in6_addr)) {
1729 err = -EINVAL 1730 err = -EINVAL;
1730 goto free; 1731 goto free;
1731 } 1732 }
1732 1733
1733 dlen = sizeof(struct 1734 dlen = sizeof(struct in6_addr);
1734 daddr->v6.sin6_flowin 1735 daddr->v6.sin6_flowinfo = flowinfo;
1735 daddr->v6.sin6_family 1736 daddr->v6.sin6_family = AF_INET6;
1736 daddr->v6.sin6_port = 1737 daddr->v6.sin6_port = htons(asoc->peer.port);
1737 memcpy(&daddr->v6.sin 1738 memcpy(&daddr->v6.sin6_addr, CMSG_DATA(cmsg), dlen);
1738 } 1739 }
1739 1740
1740 err = sctp_connect_add_peer(a 1741 err = sctp_connect_add_peer(asoc, daddr, sizeof(*daddr));
1741 if (err) 1742 if (err)
1742 goto free; 1743 goto free;
1743 } 1744 }
1744 1745
1745 return 0; 1746 return 0;
1746 1747
1747 free: 1748 free:
1748 sctp_association_free(asoc); 1749 sctp_association_free(asoc);
1749 return err; 1750 return err;
1750 } 1751 }
1751 1752
1752 static int sctp_sendmsg_check_sflags(struct s 1753 static int sctp_sendmsg_check_sflags(struct sctp_association *asoc,
1753 __u16 sf 1754 __u16 sflags, struct msghdr *msg,
1754 size_t m 1755 size_t msg_len)
1755 { 1756 {
1756 struct sock *sk = asoc->base.sk; 1757 struct sock *sk = asoc->base.sk;
1757 struct net *net = sock_net(sk); 1758 struct net *net = sock_net(sk);
1758 1759
1759 if (sctp_state(asoc, CLOSED) && sctp_ 1760 if (sctp_state(asoc, CLOSED) && sctp_style(sk, TCP))
1760 return -EPIPE; 1761 return -EPIPE;
1761 1762
1762 if ((sflags & SCTP_SENDALL) && sctp_s 1763 if ((sflags & SCTP_SENDALL) && sctp_style(sk, UDP) &&
1763 !sctp_state(asoc, ESTABLISHED)) 1764 !sctp_state(asoc, ESTABLISHED))
1764 return 0; 1765 return 0;
1765 1766
1766 if (sflags & SCTP_EOF) { 1767 if (sflags & SCTP_EOF) {
1767 pr_debug("%s: shutting down a 1768 pr_debug("%s: shutting down association:%p\n", __func__, asoc);
1768 sctp_primitive_SHUTDOWN(net, 1769 sctp_primitive_SHUTDOWN(net, asoc, NULL);
1769 1770
1770 return 0; 1771 return 0;
1771 } 1772 }
1772 1773
1773 if (sflags & SCTP_ABORT) { 1774 if (sflags & SCTP_ABORT) {
1774 struct sctp_chunk *chunk; 1775 struct sctp_chunk *chunk;
1775 1776
1776 chunk = sctp_make_abort_user( 1777 chunk = sctp_make_abort_user(asoc, msg, msg_len);
1777 if (!chunk) 1778 if (!chunk)
1778 return -ENOMEM; 1779 return -ENOMEM;
1779 1780
1780 pr_debug("%s: aborting associ 1781 pr_debug("%s: aborting association:%p\n", __func__, asoc);
1781 sctp_primitive_ABORT(net, aso 1782 sctp_primitive_ABORT(net, asoc, chunk);
1782 iov_iter_revert(&msg->msg_ite 1783 iov_iter_revert(&msg->msg_iter, msg_len);
1783 1784
1784 return 0; 1785 return 0;
1785 } 1786 }
1786 1787
1787 return 1; 1788 return 1;
1788 } 1789 }
1789 1790
1790 static int sctp_sendmsg_to_asoc(struct sctp_a 1791 static int sctp_sendmsg_to_asoc(struct sctp_association *asoc,
1791 struct msghdr 1792 struct msghdr *msg, size_t msg_len,
1792 struct sctp_t 1793 struct sctp_transport *transport,
1793 struct sctp_s 1794 struct sctp_sndrcvinfo *sinfo)
1794 { 1795 {
1795 struct sock *sk = asoc->base.sk; 1796 struct sock *sk = asoc->base.sk;
1796 struct sctp_sock *sp = sctp_sk(sk); 1797 struct sctp_sock *sp = sctp_sk(sk);
1797 struct net *net = sock_net(sk); 1798 struct net *net = sock_net(sk);
1798 struct sctp_datamsg *datamsg; 1799 struct sctp_datamsg *datamsg;
1799 bool wait_connect = false; 1800 bool wait_connect = false;
1800 struct sctp_chunk *chunk; 1801 struct sctp_chunk *chunk;
1801 long timeo; 1802 long timeo;
1802 int err; 1803 int err;
1803 1804
1804 if (sinfo->sinfo_stream >= asoc->stre 1805 if (sinfo->sinfo_stream >= asoc->stream.outcnt) {
1805 err = -EINVAL; 1806 err = -EINVAL;
1806 goto err; 1807 goto err;
1807 } 1808 }
1808 1809
1809 if (unlikely(!SCTP_SO(&asoc->stream, 1810 if (unlikely(!SCTP_SO(&asoc->stream, sinfo->sinfo_stream)->ext)) {
1810 err = sctp_stream_init_ext(&a 1811 err = sctp_stream_init_ext(&asoc->stream, sinfo->sinfo_stream);
1811 if (err) 1812 if (err)
1812 goto err; 1813 goto err;
1813 } 1814 }
1814 1815
1815 if (sp->disable_fragments && msg_len 1816 if (sp->disable_fragments && msg_len > asoc->frag_point) {
1816 err = -EMSGSIZE; 1817 err = -EMSGSIZE;
1817 goto err; 1818 goto err;
1818 } 1819 }
1819 1820
1820 if (asoc->pmtu_pending) { 1821 if (asoc->pmtu_pending) {
1821 if (sp->param_flags & SPP_PMT 1822 if (sp->param_flags & SPP_PMTUD_ENABLE)
1822 sctp_assoc_sync_pmtu( 1823 sctp_assoc_sync_pmtu(asoc);
1823 asoc->pmtu_pending = 0; 1824 asoc->pmtu_pending = 0;
1824 } 1825 }
1825 1826
1826 if (sctp_wspace(asoc) < (int)msg_len) 1827 if (sctp_wspace(asoc) < (int)msg_len)
1827 sctp_prsctp_prune(asoc, sinfo 1828 sctp_prsctp_prune(asoc, sinfo, msg_len - sctp_wspace(asoc));
1828 1829
>> 1830 if (sk_under_memory_pressure(sk))
>> 1831 sk_mem_reclaim(sk);
>> 1832
1829 if (sctp_wspace(asoc) <= 0 || !sk_wme 1833 if (sctp_wspace(asoc) <= 0 || !sk_wmem_schedule(sk, msg_len)) {
1830 timeo = sock_sndtimeo(sk, msg 1834 timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
1831 err = sctp_wait_for_sndbuf(as 1835 err = sctp_wait_for_sndbuf(asoc, &timeo, msg_len);
1832 if (err) 1836 if (err)
1833 goto err; 1837 goto err;
1834 if (unlikely(sinfo->sinfo_str <<
1835 err = -EINVAL; <<
1836 goto err; <<
1837 } <<
1838 } 1838 }
1839 1839
1840 if (sctp_state(asoc, CLOSED)) { 1840 if (sctp_state(asoc, CLOSED)) {
1841 err = sctp_primitive_ASSOCIAT 1841 err = sctp_primitive_ASSOCIATE(net, asoc, NULL);
1842 if (err) 1842 if (err)
1843 goto err; 1843 goto err;
1844 1844
1845 if (asoc->ep->intl_enable) { 1845 if (asoc->ep->intl_enable) {
1846 timeo = sock_sndtimeo 1846 timeo = sock_sndtimeo(sk, 0);
1847 err = sctp_wait_for_c 1847 err = sctp_wait_for_connect(asoc, &timeo);
1848 if (err) { 1848 if (err) {
1849 err = -ESRCH; 1849 err = -ESRCH;
1850 goto err; 1850 goto err;
1851 } 1851 }
1852 } else { 1852 } else {
1853 wait_connect = true; 1853 wait_connect = true;
1854 } 1854 }
1855 1855
1856 pr_debug("%s: we associated p 1856 pr_debug("%s: we associated primitively\n", __func__);
1857 } 1857 }
1858 1858
1859 datamsg = sctp_datamsg_from_user(asoc 1859 datamsg = sctp_datamsg_from_user(asoc, sinfo, &msg->msg_iter);
1860 if (IS_ERR(datamsg)) { 1860 if (IS_ERR(datamsg)) {
1861 err = PTR_ERR(datamsg); 1861 err = PTR_ERR(datamsg);
1862 goto err; 1862 goto err;
1863 } 1863 }
1864 1864
1865 asoc->force_delay = !!(msg->msg_flags 1865 asoc->force_delay = !!(msg->msg_flags & MSG_MORE);
1866 1866
1867 list_for_each_entry(chunk, &datamsg-> 1867 list_for_each_entry(chunk, &datamsg->chunks, frag_list) {
1868 sctp_chunk_hold(chunk); 1868 sctp_chunk_hold(chunk);
1869 sctp_set_owner_w(chunk); 1869 sctp_set_owner_w(chunk);
1870 chunk->transport = transport; 1870 chunk->transport = transport;
1871 } 1871 }
1872 1872
1873 err = sctp_primitive_SEND(net, asoc, 1873 err = sctp_primitive_SEND(net, asoc, datamsg);
1874 if (err) { 1874 if (err) {
1875 sctp_datamsg_free(datamsg); 1875 sctp_datamsg_free(datamsg);
1876 goto err; 1876 goto err;
1877 } 1877 }
1878 1878
1879 pr_debug("%s: we sent primitively\n", 1879 pr_debug("%s: we sent primitively\n", __func__);
1880 1880
1881 sctp_datamsg_put(datamsg); 1881 sctp_datamsg_put(datamsg);
1882 1882
1883 if (unlikely(wait_connect)) { 1883 if (unlikely(wait_connect)) {
1884 timeo = sock_sndtimeo(sk, msg 1884 timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
1885 sctp_wait_for_connect(asoc, & 1885 sctp_wait_for_connect(asoc, &timeo);
1886 } 1886 }
1887 1887
1888 err = msg_len; 1888 err = msg_len;
1889 1889
1890 err: 1890 err:
1891 return err; 1891 return err;
1892 } 1892 }
1893 1893
1894 static union sctp_addr *sctp_sendmsg_get_dadd 1894 static union sctp_addr *sctp_sendmsg_get_daddr(struct sock *sk,
1895 1895 const struct msghdr *msg,
1896 1896 struct sctp_cmsgs *cmsgs)
1897 { 1897 {
1898 union sctp_addr *daddr = NULL; 1898 union sctp_addr *daddr = NULL;
1899 int err; 1899 int err;
1900 1900
1901 if (!sctp_style(sk, UDP_HIGH_BANDWIDT 1901 if (!sctp_style(sk, UDP_HIGH_BANDWIDTH) && msg->msg_name) {
1902 int len = msg->msg_namelen; 1902 int len = msg->msg_namelen;
1903 1903
1904 if (len > sizeof(*daddr)) 1904 if (len > sizeof(*daddr))
1905 len = sizeof(*daddr); 1905 len = sizeof(*daddr);
1906 1906
1907 daddr = (union sctp_addr *)ms 1907 daddr = (union sctp_addr *)msg->msg_name;
1908 1908
1909 err = sctp_verify_addr(sk, da 1909 err = sctp_verify_addr(sk, daddr, len);
1910 if (err) 1910 if (err)
1911 return ERR_PTR(err); 1911 return ERR_PTR(err);
1912 } 1912 }
1913 1913
1914 return daddr; 1914 return daddr;
1915 } 1915 }
1916 1916
1917 static void sctp_sendmsg_update_sinfo(struct 1917 static void sctp_sendmsg_update_sinfo(struct sctp_association *asoc,
1918 struct 1918 struct sctp_sndrcvinfo *sinfo,
1919 struct 1919 struct sctp_cmsgs *cmsgs)
1920 { 1920 {
1921 if (!cmsgs->srinfo && !cmsgs->sinfo) 1921 if (!cmsgs->srinfo && !cmsgs->sinfo) {
1922 sinfo->sinfo_stream = asoc->d 1922 sinfo->sinfo_stream = asoc->default_stream;
1923 sinfo->sinfo_ppid = asoc->def 1923 sinfo->sinfo_ppid = asoc->default_ppid;
1924 sinfo->sinfo_context = asoc-> 1924 sinfo->sinfo_context = asoc->default_context;
1925 sinfo->sinfo_assoc_id = sctp_ 1925 sinfo->sinfo_assoc_id = sctp_assoc2id(asoc);
1926 1926
1927 if (!cmsgs->prinfo) 1927 if (!cmsgs->prinfo)
1928 sinfo->sinfo_flags = 1928 sinfo->sinfo_flags = asoc->default_flags;
1929 } 1929 }
1930 1930
1931 if (!cmsgs->srinfo && !cmsgs->prinfo) 1931 if (!cmsgs->srinfo && !cmsgs->prinfo)
1932 sinfo->sinfo_timetolive = aso 1932 sinfo->sinfo_timetolive = asoc->default_timetolive;
1933 1933
1934 if (cmsgs->authinfo) { 1934 if (cmsgs->authinfo) {
1935 /* Reuse sinfo_tsn to indicat 1935 /* Reuse sinfo_tsn to indicate that authinfo was set and
1936 * sinfo_ssn to save the keyi 1936 * sinfo_ssn to save the keyid on tx path.
1937 */ 1937 */
1938 sinfo->sinfo_tsn = 1; 1938 sinfo->sinfo_tsn = 1;
1939 sinfo->sinfo_ssn = cmsgs->aut 1939 sinfo->sinfo_ssn = cmsgs->authinfo->auth_keynumber;
1940 } 1940 }
1941 } 1941 }
1942 1942
1943 static int sctp_sendmsg(struct sock *sk, stru 1943 static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
1944 { 1944 {
1945 struct sctp_endpoint *ep = sctp_sk(sk 1945 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
1946 struct sctp_transport *transport = NU 1946 struct sctp_transport *transport = NULL;
1947 struct sctp_sndrcvinfo _sinfo, *sinfo 1947 struct sctp_sndrcvinfo _sinfo, *sinfo;
1948 struct sctp_association *asoc, *tmp; 1948 struct sctp_association *asoc, *tmp;
1949 struct sctp_cmsgs cmsgs; 1949 struct sctp_cmsgs cmsgs;
1950 union sctp_addr *daddr; 1950 union sctp_addr *daddr;
1951 bool new = false; 1951 bool new = false;
1952 __u16 sflags; 1952 __u16 sflags;
1953 int err; 1953 int err;
1954 1954
1955 /* Parse and get snd_info */ 1955 /* Parse and get snd_info */
1956 err = sctp_sendmsg_parse(sk, &cmsgs, 1956 err = sctp_sendmsg_parse(sk, &cmsgs, &_sinfo, msg, msg_len);
1957 if (err) 1957 if (err)
1958 goto out; 1958 goto out;
1959 1959
1960 sinfo = &_sinfo; 1960 sinfo = &_sinfo;
1961 sflags = sinfo->sinfo_flags; 1961 sflags = sinfo->sinfo_flags;
1962 1962
1963 /* Get daddr from msg */ 1963 /* Get daddr from msg */
1964 daddr = sctp_sendmsg_get_daddr(sk, ms 1964 daddr = sctp_sendmsg_get_daddr(sk, msg, &cmsgs);
1965 if (IS_ERR(daddr)) { 1965 if (IS_ERR(daddr)) {
1966 err = PTR_ERR(daddr); 1966 err = PTR_ERR(daddr);
1967 goto out; 1967 goto out;
1968 } 1968 }
1969 1969
1970 lock_sock(sk); 1970 lock_sock(sk);
1971 1971
1972 /* SCTP_SENDALL process */ 1972 /* SCTP_SENDALL process */
1973 if ((sflags & SCTP_SENDALL) && sctp_s 1973 if ((sflags & SCTP_SENDALL) && sctp_style(sk, UDP)) {
1974 list_for_each_entry_safe(asoc 1974 list_for_each_entry_safe(asoc, tmp, &ep->asocs, asocs) {
1975 err = sctp_sendmsg_ch 1975 err = sctp_sendmsg_check_sflags(asoc, sflags, msg,
1976 1976 msg_len);
1977 if (err == 0) 1977 if (err == 0)
1978 continue; 1978 continue;
1979 if (err < 0) 1979 if (err < 0)
1980 goto out_unlo 1980 goto out_unlock;
1981 1981
1982 sctp_sendmsg_update_s 1982 sctp_sendmsg_update_sinfo(asoc, sinfo, &cmsgs);
1983 1983
1984 err = sctp_sendmsg_to 1984 err = sctp_sendmsg_to_asoc(asoc, msg, msg_len,
1985 1985 NULL, sinfo);
1986 if (err < 0) 1986 if (err < 0)
1987 goto out_unlo 1987 goto out_unlock;
1988 1988
1989 iov_iter_revert(&msg- 1989 iov_iter_revert(&msg->msg_iter, err);
1990 } 1990 }
1991 1991
1992 goto out_unlock; 1992 goto out_unlock;
1993 } 1993 }
1994 1994
1995 /* Get and check or create asoc */ 1995 /* Get and check or create asoc */
1996 if (daddr) { 1996 if (daddr) {
1997 asoc = sctp_endpoint_lookup_a 1997 asoc = sctp_endpoint_lookup_assoc(ep, daddr, &transport);
1998 if (asoc) { 1998 if (asoc) {
1999 err = sctp_sendmsg_ch 1999 err = sctp_sendmsg_check_sflags(asoc, sflags, msg,
2000 2000 msg_len);
2001 if (err <= 0) 2001 if (err <= 0)
2002 goto out_unlo 2002 goto out_unlock;
2003 } else { 2003 } else {
2004 err = sctp_sendmsg_ne 2004 err = sctp_sendmsg_new_asoc(sk, sflags, &cmsgs, daddr,
2005 2005 &transport);
2006 if (err) 2006 if (err)
2007 goto out_unlo 2007 goto out_unlock;
2008 2008
2009 asoc = transport->aso 2009 asoc = transport->asoc;
2010 new = true; 2010 new = true;
2011 } 2011 }
2012 2012
2013 if (!sctp_style(sk, TCP) && ! 2013 if (!sctp_style(sk, TCP) && !(sflags & SCTP_ADDR_OVER))
2014 transport = NULL; 2014 transport = NULL;
2015 } else { 2015 } else {
2016 asoc = sctp_id2assoc(sk, sinf 2016 asoc = sctp_id2assoc(sk, sinfo->sinfo_assoc_id);
2017 if (!asoc) { 2017 if (!asoc) {
2018 err = -EPIPE; 2018 err = -EPIPE;
2019 goto out_unlock; 2019 goto out_unlock;
2020 } 2020 }
2021 2021
2022 err = sctp_sendmsg_check_sfla 2022 err = sctp_sendmsg_check_sflags(asoc, sflags, msg, msg_len);
2023 if (err <= 0) 2023 if (err <= 0)
2024 goto out_unlock; 2024 goto out_unlock;
2025 } 2025 }
2026 2026
2027 /* Update snd_info with the asoc */ 2027 /* Update snd_info with the asoc */
2028 sctp_sendmsg_update_sinfo(asoc, sinfo 2028 sctp_sendmsg_update_sinfo(asoc, sinfo, &cmsgs);
2029 2029
2030 /* Send msg to the asoc */ 2030 /* Send msg to the asoc */
2031 err = sctp_sendmsg_to_asoc(asoc, msg, 2031 err = sctp_sendmsg_to_asoc(asoc, msg, msg_len, transport, sinfo);
2032 if (err < 0 && err != -ESRCH && new) 2032 if (err < 0 && err != -ESRCH && new)
2033 sctp_association_free(asoc); 2033 sctp_association_free(asoc);
2034 2034
2035 out_unlock: 2035 out_unlock:
2036 release_sock(sk); 2036 release_sock(sk);
2037 out: 2037 out:
2038 return sctp_error(sk, msg->msg_flags, 2038 return sctp_error(sk, msg->msg_flags, err);
2039 } 2039 }
2040 2040
2041 /* This is an extended version of skb_pull() 2041 /* This is an extended version of skb_pull() that removes the data from the
2042 * start of a skb even when data is spread ac 2042 * start of a skb even when data is spread across the list of skb's in the
2043 * frag_list. len specifies the total amount 2043 * frag_list. len specifies the total amount of data that needs to be removed.
2044 * when 'len' bytes could be removed from the 2044 * when 'len' bytes could be removed from the skb, it returns 0.
2045 * If 'len' exceeds the total skb length, it 2045 * If 'len' exceeds the total skb length, it returns the no. of bytes that
2046 * could not be removed. 2046 * could not be removed.
2047 */ 2047 */
2048 static int sctp_skb_pull(struct sk_buff *skb, 2048 static int sctp_skb_pull(struct sk_buff *skb, int len)
2049 { 2049 {
2050 struct sk_buff *list; 2050 struct sk_buff *list;
2051 int skb_len = skb_headlen(skb); 2051 int skb_len = skb_headlen(skb);
2052 int rlen; 2052 int rlen;
2053 2053
2054 if (len <= skb_len) { 2054 if (len <= skb_len) {
2055 __skb_pull(skb, len); 2055 __skb_pull(skb, len);
2056 return 0; 2056 return 0;
2057 } 2057 }
2058 len -= skb_len; 2058 len -= skb_len;
2059 __skb_pull(skb, skb_len); 2059 __skb_pull(skb, skb_len);
2060 2060
2061 skb_walk_frags(skb, list) { 2061 skb_walk_frags(skb, list) {
2062 rlen = sctp_skb_pull(list, le 2062 rlen = sctp_skb_pull(list, len);
2063 skb->len -= (len-rlen); 2063 skb->len -= (len-rlen);
2064 skb->data_len -= (len-rlen); 2064 skb->data_len -= (len-rlen);
2065 2065
2066 if (!rlen) 2066 if (!rlen)
2067 return 0; 2067 return 0;
2068 2068
2069 len = rlen; 2069 len = rlen;
2070 } 2070 }
2071 2071
2072 return len; 2072 return len;
2073 } 2073 }
2074 2074
2075 /* API 3.1.3 recvmsg() - UDP Style Syntax 2075 /* API 3.1.3 recvmsg() - UDP Style Syntax
2076 * 2076 *
2077 * ssize_t recvmsg(int socket, struct msghdr 2077 * ssize_t recvmsg(int socket, struct msghdr *message,
2078 * int flags); 2078 * int flags);
2079 * 2079 *
2080 * socket - the socket descriptor of the en 2080 * socket - the socket descriptor of the endpoint.
2081 * message - pointer to the msghdr structure 2081 * message - pointer to the msghdr structure which contains a single
2082 * user message and possibly some 2082 * user message and possibly some ancillary data.
2083 * 2083 *
2084 * See Section 5 for complete desc 2084 * See Section 5 for complete description of the data
2085 * structures. 2085 * structures.
2086 * 2086 *
2087 * flags - flags sent or received with the 2087 * flags - flags sent or received with the user message, see Section
2088 * 5 for complete description of t 2088 * 5 for complete description of the flags.
2089 */ 2089 */
2090 static int sctp_recvmsg(struct sock *sk, stru 2090 static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
2091 int flags, int *addr_ !! 2091 int noblock, int flags, int *addr_len)
2092 { 2092 {
2093 struct sctp_ulpevent *event = NULL; 2093 struct sctp_ulpevent *event = NULL;
2094 struct sctp_sock *sp = sctp_sk(sk); 2094 struct sctp_sock *sp = sctp_sk(sk);
2095 struct sk_buff *skb, *head_skb; 2095 struct sk_buff *skb, *head_skb;
2096 int copied; 2096 int copied;
2097 int err = 0; 2097 int err = 0;
2098 int skb_len; 2098 int skb_len;
2099 2099
2100 pr_debug("%s: sk:%p, msghdr:%p, len:% !! 2100 pr_debug("%s: sk:%p, msghdr:%p, len:%zd, noblock:%d, flags:0x%x, "
2101 __func__, sk, msg, len, flag !! 2101 "addr_len:%p)\n", __func__, sk, msg, len, noblock, flags,
2102 !! 2102 addr_len);
2103 if (unlikely(flags & MSG_ERRQUEUE)) <<
2104 return inet_recv_error(sk, ms <<
2105 <<
2106 if (sk_can_busy_loop(sk) && <<
2107 skb_queue_empty_lockless(&sk->sk_ <<
2108 sk_busy_loop(sk, flags & MSG_ <<
2109 2103
2110 lock_sock(sk); 2104 lock_sock(sk);
2111 2105
2112 if (sctp_style(sk, TCP) && !sctp_ssta 2106 if (sctp_style(sk, TCP) && !sctp_sstate(sk, ESTABLISHED) &&
2113 !sctp_sstate(sk, CLOSING) && !sct 2107 !sctp_sstate(sk, CLOSING) && !sctp_sstate(sk, CLOSED)) {
2114 err = -ENOTCONN; 2108 err = -ENOTCONN;
2115 goto out; 2109 goto out;
2116 } 2110 }
2117 2111
2118 skb = sctp_skb_recv_datagram(sk, flag !! 2112 skb = sctp_skb_recv_datagram(sk, flags, noblock, &err);
2119 if (!skb) 2113 if (!skb)
2120 goto out; 2114 goto out;
2121 2115
2122 /* Get the total length of the skb in 2116 /* Get the total length of the skb including any skb's in the
2123 * frag_list. 2117 * frag_list.
2124 */ 2118 */
2125 skb_len = skb->len; 2119 skb_len = skb->len;
2126 2120
2127 copied = skb_len; 2121 copied = skb_len;
2128 if (copied > len) 2122 if (copied > len)
2129 copied = len; 2123 copied = len;
2130 2124
2131 err = skb_copy_datagram_msg(skb, 0, m 2125 err = skb_copy_datagram_msg(skb, 0, msg, copied);
2132 2126
2133 event = sctp_skb2event(skb); 2127 event = sctp_skb2event(skb);
2134 2128
2135 if (err) 2129 if (err)
2136 goto out_free; 2130 goto out_free;
2137 2131
2138 if (event->chunk && event->chunk->hea 2132 if (event->chunk && event->chunk->head_skb)
2139 head_skb = event->chunk->head 2133 head_skb = event->chunk->head_skb;
2140 else 2134 else
2141 head_skb = skb; 2135 head_skb = skb;
2142 sock_recv_cmsgs(msg, sk, head_skb); !! 2136 sock_recv_ts_and_drops(msg, sk, head_skb);
2143 if (sctp_ulpevent_is_notification(eve 2137 if (sctp_ulpevent_is_notification(event)) {
2144 msg->msg_flags |= MSG_NOTIFIC 2138 msg->msg_flags |= MSG_NOTIFICATION;
2145 sp->pf->event_msgname(event, 2139 sp->pf->event_msgname(event, msg->msg_name, addr_len);
2146 } else { 2140 } else {
2147 sp->pf->skb_msgname(head_skb, 2141 sp->pf->skb_msgname(head_skb, msg->msg_name, addr_len);
2148 } 2142 }
2149 2143
2150 /* Check if we allow SCTP_NXTINFO. */ 2144 /* Check if we allow SCTP_NXTINFO. */
2151 if (sp->recvnxtinfo) 2145 if (sp->recvnxtinfo)
2152 sctp_ulpevent_read_nxtinfo(ev 2146 sctp_ulpevent_read_nxtinfo(event, msg, sk);
2153 /* Check if we allow SCTP_RCVINFO. */ 2147 /* Check if we allow SCTP_RCVINFO. */
2154 if (sp->recvrcvinfo) 2148 if (sp->recvrcvinfo)
2155 sctp_ulpevent_read_rcvinfo(ev 2149 sctp_ulpevent_read_rcvinfo(event, msg);
2156 /* Check if we allow SCTP_SNDRCVINFO. 2150 /* Check if we allow SCTP_SNDRCVINFO. */
2157 if (sctp_ulpevent_type_enabled(sp->su 2151 if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_DATA_IO_EVENT))
2158 sctp_ulpevent_read_sndrcvinfo 2152 sctp_ulpevent_read_sndrcvinfo(event, msg);
2159 2153
2160 err = copied; 2154 err = copied;
2161 2155
2162 /* If skb's length exceeds the user's 2156 /* If skb's length exceeds the user's buffer, update the skb and
2163 * push it back to the receive_queue 2157 * push it back to the receive_queue so that the next call to
2164 * recvmsg() will return the remainin 2158 * recvmsg() will return the remaining data. Don't set MSG_EOR.
2165 */ 2159 */
2166 if (skb_len > copied) { 2160 if (skb_len > copied) {
2167 msg->msg_flags &= ~MSG_EOR; 2161 msg->msg_flags &= ~MSG_EOR;
2168 if (flags & MSG_PEEK) 2162 if (flags & MSG_PEEK)
2169 goto out_free; 2163 goto out_free;
2170 sctp_skb_pull(skb, copied); 2164 sctp_skb_pull(skb, copied);
2171 skb_queue_head(&sk->sk_receiv 2165 skb_queue_head(&sk->sk_receive_queue, skb);
2172 2166
2173 /* When only partial message 2167 /* When only partial message is copied to the user, increase
2174 * rwnd by that amount. If al 2168 * rwnd by that amount. If all the data in the skb is read,
2175 * rwnd is updated when the e 2169 * rwnd is updated when the event is freed.
2176 */ 2170 */
2177 if (!sctp_ulpevent_is_notific 2171 if (!sctp_ulpevent_is_notification(event))
2178 sctp_assoc_rwnd_incre 2172 sctp_assoc_rwnd_increase(event->asoc, copied);
2179 goto out; 2173 goto out;
2180 } else if ((event->msg_flags & MSG_NO 2174 } else if ((event->msg_flags & MSG_NOTIFICATION) ||
2181 (event->msg_flags & MSG_EO 2175 (event->msg_flags & MSG_EOR))
2182 msg->msg_flags |= MSG_EOR; 2176 msg->msg_flags |= MSG_EOR;
2183 else 2177 else
2184 msg->msg_flags &= ~MSG_EOR; 2178 msg->msg_flags &= ~MSG_EOR;
2185 2179
2186 out_free: 2180 out_free:
2187 if (flags & MSG_PEEK) { 2181 if (flags & MSG_PEEK) {
2188 /* Release the skb reference 2182 /* Release the skb reference acquired after peeking the skb in
2189 * sctp_skb_recv_datagram(). 2183 * sctp_skb_recv_datagram().
2190 */ 2184 */
2191 kfree_skb(skb); 2185 kfree_skb(skb);
2192 } else { 2186 } else {
2193 /* Free the event which inclu 2187 /* Free the event which includes releasing the reference to
2194 * the owner of the skb, free 2188 * the owner of the skb, freeing the skb and updating the
2195 * rwnd. 2189 * rwnd.
2196 */ 2190 */
2197 sctp_ulpevent_free(event); 2191 sctp_ulpevent_free(event);
2198 } 2192 }
2199 out: 2193 out:
2200 release_sock(sk); 2194 release_sock(sk);
2201 return err; 2195 return err;
2202 } 2196 }
2203 2197
2204 /* 7.1.12 Enable/Disable message fragmentatio 2198 /* 7.1.12 Enable/Disable message fragmentation (SCTP_DISABLE_FRAGMENTS)
2205 * 2199 *
2206 * This option is a on/off flag. If enabled 2200 * This option is a on/off flag. If enabled no SCTP message
2207 * fragmentation will be performed. Instead 2201 * fragmentation will be performed. Instead if a message being sent
2208 * exceeds the current PMTU size, the message 2202 * exceeds the current PMTU size, the message will NOT be sent and
2209 * instead a error will be indicated to the u 2203 * instead a error will be indicated to the user.
2210 */ 2204 */
2211 static int sctp_setsockopt_disable_fragments( !! 2205 static int sctp_setsockopt_disable_fragments(struct sock *sk,
>> 2206 char __user *optval,
2212 2207 unsigned int optlen)
2213 { 2208 {
>> 2209 int val;
>> 2210
2214 if (optlen < sizeof(int)) 2211 if (optlen < sizeof(int))
2215 return -EINVAL; 2212 return -EINVAL;
2216 sctp_sk(sk)->disable_fragments = (*va !! 2213
>> 2214 if (get_user(val, (int __user *)optval))
>> 2215 return -EFAULT;
>> 2216
>> 2217 sctp_sk(sk)->disable_fragments = (val == 0) ? 0 : 1;
>> 2218
2217 return 0; 2219 return 0;
2218 } 2220 }
2219 2221
2220 static int sctp_setsockopt_events(struct sock !! 2222 static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
2221 unsigned in 2223 unsigned int optlen)
2222 { 2224 {
>> 2225 struct sctp_event_subscribe subscribe;
>> 2226 __u8 *sn_type = (__u8 *)&subscribe;
2223 struct sctp_sock *sp = sctp_sk(sk); 2227 struct sctp_sock *sp = sctp_sk(sk);
2224 struct sctp_association *asoc; 2228 struct sctp_association *asoc;
2225 int i; 2229 int i;
2226 2230
2227 if (optlen > sizeof(struct sctp_event 2231 if (optlen > sizeof(struct sctp_event_subscribe))
2228 return -EINVAL; 2232 return -EINVAL;
2229 2233
>> 2234 if (copy_from_user(&subscribe, optval, optlen))
>> 2235 return -EFAULT;
>> 2236
2230 for (i = 0; i < optlen; i++) 2237 for (i = 0; i < optlen; i++)
2231 sctp_ulpevent_type_set(&sp->s 2238 sctp_ulpevent_type_set(&sp->subscribe, SCTP_SN_TYPE_BASE + i,
2232 sn_typ 2239 sn_type[i]);
2233 2240
2234 list_for_each_entry(asoc, &sp->ep->as 2241 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
2235 asoc->subscribe = sctp_sk(sk) 2242 asoc->subscribe = sctp_sk(sk)->subscribe;
2236 2243
2237 /* At the time when a user app subscr 2244 /* At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
2238 * if there is no data to be sent or 2245 * if there is no data to be sent or retransmit, the stack will
2239 * immediately send up this notificat 2246 * immediately send up this notification.
2240 */ 2247 */
2241 if (sctp_ulpevent_type_enabled(sp->su 2248 if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_SENDER_DRY_EVENT)) {
2242 struct sctp_ulpevent *event; 2249 struct sctp_ulpevent *event;
2243 2250
2244 asoc = sctp_id2assoc(sk, 0); 2251 asoc = sctp_id2assoc(sk, 0);
2245 if (asoc && sctp_outq_is_empt 2252 if (asoc && sctp_outq_is_empty(&asoc->outqueue)) {
2246 event = sctp_ulpevent 2253 event = sctp_ulpevent_make_sender_dry_event(asoc,
2247 GFP_U 2254 GFP_USER | __GFP_NOWARN);
2248 if (!event) 2255 if (!event)
2249 return -ENOME 2256 return -ENOMEM;
2250 2257
2251 asoc->stream.si->enqu 2258 asoc->stream.si->enqueue_event(&asoc->ulpq, event);
2252 } 2259 }
2253 } 2260 }
2254 2261
2255 return 0; 2262 return 0;
2256 } 2263 }
2257 2264
2258 /* 7.1.8 Automatic Close of associations (SCT 2265 /* 7.1.8 Automatic Close of associations (SCTP_AUTOCLOSE)
2259 * 2266 *
2260 * This socket option is applicable to the UD 2267 * This socket option is applicable to the UDP-style socket only. When
2261 * set it will cause associations that are id 2268 * set it will cause associations that are idle for more than the
2262 * specified number of seconds to automatical 2269 * specified number of seconds to automatically close. An association
2263 * being idle is defined an association that 2270 * being idle is defined an association that has NOT sent or received
2264 * user data. The special value of '' indica 2271 * user data. The special value of '' indicates that no automatic
2265 * close of any associations should be perfor 2272 * close of any associations should be performed. The option expects an
2266 * integer defining the number of seconds of 2273 * integer defining the number of seconds of idle time before an
2267 * association is closed. 2274 * association is closed.
2268 */ 2275 */
2269 static int sctp_setsockopt_autoclose(struct s !! 2276 static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
2270 unsigned 2277 unsigned int optlen)
2271 { 2278 {
2272 struct sctp_sock *sp = sctp_sk(sk); 2279 struct sctp_sock *sp = sctp_sk(sk);
2273 struct net *net = sock_net(sk); 2280 struct net *net = sock_net(sk);
2274 2281
2275 /* Applicable to UDP-style socket onl 2282 /* Applicable to UDP-style socket only */
2276 if (sctp_style(sk, TCP)) 2283 if (sctp_style(sk, TCP))
2277 return -EOPNOTSUPP; 2284 return -EOPNOTSUPP;
2278 if (optlen != sizeof(int)) 2285 if (optlen != sizeof(int))
2279 return -EINVAL; 2286 return -EINVAL;
>> 2287 if (copy_from_user(&sp->autoclose, optval, optlen))
>> 2288 return -EFAULT;
2280 2289
2281 sp->autoclose = *optval; <<
2282 if (sp->autoclose > net->sctp.max_aut 2290 if (sp->autoclose > net->sctp.max_autoclose)
2283 sp->autoclose = net->sctp.max 2291 sp->autoclose = net->sctp.max_autoclose;
2284 2292
2285 return 0; 2293 return 0;
2286 } 2294 }
2287 2295
2288 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ 2296 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ADDR_PARAMS)
2289 * 2297 *
2290 * Applications can enable or disable heartbe 2298 * Applications can enable or disable heartbeats for any peer address of
2291 * an association, modify an address's heartb 2299 * an association, modify an address's heartbeat interval, force a
2292 * heartbeat to be sent immediately, and adju 2300 * heartbeat to be sent immediately, and adjust the address's maximum
2293 * number of retransmissions sent before an a 2301 * number of retransmissions sent before an address is considered
2294 * unreachable. The following structure is u 2302 * unreachable. The following structure is used to access and modify an
2295 * address's parameters: 2303 * address's parameters:
2296 * 2304 *
2297 * struct sctp_paddrparams { 2305 * struct sctp_paddrparams {
2298 * sctp_assoc_t spp_assoc_id; 2306 * sctp_assoc_t spp_assoc_id;
2299 * struct sockaddr_storage spp_address; 2307 * struct sockaddr_storage spp_address;
2300 * uint32_t spp_hbinterval 2308 * uint32_t spp_hbinterval;
2301 * uint16_t spp_pathmaxrxt 2309 * uint16_t spp_pathmaxrxt;
2302 * uint32_t spp_pathmtu; 2310 * uint32_t spp_pathmtu;
2303 * uint32_t spp_sackdelay; 2311 * uint32_t spp_sackdelay;
2304 * uint32_t spp_flags; 2312 * uint32_t spp_flags;
2305 * uint32_t spp_ipv6_flowl 2313 * uint32_t spp_ipv6_flowlabel;
2306 * uint8_t spp_dscp; 2314 * uint8_t spp_dscp;
2307 * }; 2315 * };
2308 * 2316 *
2309 * spp_assoc_id - (one-to-many style soc 2317 * spp_assoc_id - (one-to-many style socket) This is filled in the
2310 * application, and ident 2318 * application, and identifies the association for
2311 * this query. 2319 * this query.
2312 * spp_address - This specifies which a 2320 * spp_address - This specifies which address is of interest.
2313 * spp_hbinterval - This contains the valu 2321 * spp_hbinterval - This contains the value of the heartbeat interval,
2314 * in milliseconds. If a 2322 * in milliseconds. If a value of zero
2315 * is present in this fie 2323 * is present in this field then no changes are to
2316 * be made to this parame 2324 * be made to this parameter.
2317 * spp_pathmaxrxt - This contains the maxi 2325 * spp_pathmaxrxt - This contains the maximum number of
2318 * retransmissions before 2326 * retransmissions before this address shall be
2319 * considered unreachable 2327 * considered unreachable. If a value of zero
2320 * is present in this fie 2328 * is present in this field then no changes are to
2321 * be made to this parame 2329 * be made to this parameter.
2322 * spp_pathmtu - When Path MTU discover 2330 * spp_pathmtu - When Path MTU discovery is disabled the value
2323 * specified here will be 2331 * specified here will be the "fixed" path mtu.
2324 * Note that if the spp_a 2332 * Note that if the spp_address field is empty
2325 * then all associations 2333 * then all associations on this address will
2326 * have this fixed path m 2334 * have this fixed path mtu set upon them.
2327 * 2335 *
2328 * spp_sackdelay - When delayed sack is e 2336 * spp_sackdelay - When delayed sack is enabled, this value specifies
2329 * the number of millisec 2337 * the number of milliseconds that sacks will be delayed
2330 * for. This value will a 2338 * for. This value will apply to all addresses of an
2331 * association if the spp 2339 * association if the spp_address field is empty. Note
2332 * also, that if delayed 2340 * also, that if delayed sack is enabled and this
2333 * value is set to 0, no 2341 * value is set to 0, no change is made to the last
2334 * recorded delayed sack 2342 * recorded delayed sack timer value.
2335 * 2343 *
2336 * spp_flags - These flags are used t 2344 * spp_flags - These flags are used to control various features
2337 * on an association. The 2345 * on an association. The flag field may contain
2338 * zero or more of the fo 2346 * zero or more of the following options.
2339 * 2347 *
2340 * SPP_HB_ENABLE - Enabl 2348 * SPP_HB_ENABLE - Enable heartbeats on the
2341 * specified address. Not 2349 * specified address. Note that if the address
2342 * field is empty all add 2350 * field is empty all addresses for the association
2343 * have heartbeats enable 2351 * have heartbeats enabled upon them.
2344 * 2352 *
2345 * SPP_HB_DISABLE - Disab 2353 * SPP_HB_DISABLE - Disable heartbeats on the
2346 * speicifed address. Not 2354 * speicifed address. Note that if the address
2347 * field is empty all add 2355 * field is empty all addresses for the association
2348 * will have their heartb 2356 * will have their heartbeats disabled. Note also
2349 * that SPP_HB_ENABLE and 2357 * that SPP_HB_ENABLE and SPP_HB_DISABLE are
2350 * mutually exclusive, on 2358 * mutually exclusive, only one of these two should
2351 * be specified. Enabling 2359 * be specified. Enabling both fields will have
2352 * undetermined results. 2360 * undetermined results.
2353 * 2361 *
2354 * SPP_HB_DEMAND - Reques 2362 * SPP_HB_DEMAND - Request a user initiated heartbeat
2355 * to be made immediately 2363 * to be made immediately.
2356 * 2364 *
2357 * SPP_HB_TIME_IS_ZERO - 2365 * SPP_HB_TIME_IS_ZERO - Specify's that the time for
2358 * heartbeat delayis to b 2366 * heartbeat delayis to be set to the value of 0
2359 * milliseconds. 2367 * milliseconds.
2360 * 2368 *
2361 * SPP_PMTUD_ENABLE - Thi 2369 * SPP_PMTUD_ENABLE - This field will enable PMTU
2362 * discovery upon the spe 2370 * discovery upon the specified address. Note that
2363 * if the address feild i 2371 * if the address feild is empty then all addresses
2364 * on the association are 2372 * on the association are effected.
2365 * 2373 *
2366 * SPP_PMTUD_DISABLE - Th 2374 * SPP_PMTUD_DISABLE - This field will disable PMTU
2367 * discovery upon the spe 2375 * discovery upon the specified address. Note that
2368 * if the address feild i 2376 * if the address feild is empty then all addresses
2369 * on the association are 2377 * on the association are effected. Not also that
2370 * SPP_PMTUD_ENABLE and S 2378 * SPP_PMTUD_ENABLE and SPP_PMTUD_DISABLE are mutually
2371 * exclusive. Enabling bo 2379 * exclusive. Enabling both will have undetermined
2372 * results. 2380 * results.
2373 * 2381 *
2374 * SPP_SACKDELAY_ENABLE - 2382 * SPP_SACKDELAY_ENABLE - Setting this flag turns
2375 * on delayed sack. The t 2383 * on delayed sack. The time specified in spp_sackdelay
2376 * is used to specify the 2384 * is used to specify the sack delay for this address. Note
2377 * that if spp_address is 2385 * that if spp_address is empty then all addresses will
2378 * enable delayed sack an 2386 * enable delayed sack and take on the sack delay
2379 * value specified in spp 2387 * value specified in spp_sackdelay.
2380 * SPP_SACKDELAY_DISABLE 2388 * SPP_SACKDELAY_DISABLE - Setting this flag turns
2381 * off delayed sack. If t 2389 * off delayed sack. If the spp_address field is blank then
2382 * delayed sack is disabl 2390 * delayed sack is disabled for the entire association. Note
2383 * also that this field i 2391 * also that this field is mutually exclusive to
2384 * SPP_SACKDELAY_ENABLE, 2392 * SPP_SACKDELAY_ENABLE, setting both will have undefined
2385 * results. 2393 * results.
2386 * 2394 *
2387 * SPP_IPV6_FLOWLABEL: S 2395 * SPP_IPV6_FLOWLABEL: Setting this flag enables the
2388 * setting of the IPV6 fl 2396 * setting of the IPV6 flow label value. The value is
2389 * contained in the spp_i 2397 * contained in the spp_ipv6_flowlabel field.
2390 * Upon retrieval, this f 2398 * Upon retrieval, this flag will be set to indicate that
2391 * the spp_ipv6_flowlabel 2399 * the spp_ipv6_flowlabel field has a valid value returned.
2392 * If a specific destinat 2400 * If a specific destination address is set (in the
2393 * spp_address field), th 2401 * spp_address field), then the value returned is that of
2394 * the address. If just 2402 * the address. If just an association is specified (and
2395 * no address), then the 2403 * no address), then the association's default flow label
2396 * is returned. If neith 2404 * is returned. If neither an association nor a destination
2397 * is specified, then the 2405 * is specified, then the socket's default flow label is
2398 * returned. For non-IPv 2406 * returned. For non-IPv6 sockets, this flag will be left
2399 * cleared. 2407 * cleared.
2400 * 2408 *
2401 * SPP_DSCP: Setting thi 2409 * SPP_DSCP: Setting this flag enables the setting of the
2402 * Differentiated Service 2410 * Differentiated Services Code Point (DSCP) value
2403 * associated with either 2411 * associated with either the association or a specific
2404 * address. The value is 2412 * address. The value is obtained in the spp_dscp field.
2405 * Upon retrieval, this f 2413 * Upon retrieval, this flag will be set to indicate that
2406 * the spp_dscp field has 2414 * the spp_dscp field has a valid value returned. If a
2407 * specific destination a 2415 * specific destination address is set when called (in the
2408 * spp_address field), th 2416 * spp_address field), then that specific destination
2409 * address's DSCP value i 2417 * address's DSCP value is returned. If just an association
2410 * is specified, then the 2418 * is specified, then the association's default DSCP is
2411 * returned. If neither 2419 * returned. If neither an association nor a destination is
2412 * specified, then the so 2420 * specified, then the socket's default DSCP is returned.
2413 * 2421 *
2414 * spp_ipv6_flowlabel 2422 * spp_ipv6_flowlabel
2415 * - This field is used in 2423 * - This field is used in conjunction with the
2416 * SPP_IPV6_FLOWLABEL fla 2424 * SPP_IPV6_FLOWLABEL flag and contains the IPv6 flow label.
2417 * The 20 least significa 2425 * The 20 least significant bits are used for the flow
2418 * label. This setting h 2426 * label. This setting has precedence over any IPv6-layer
2419 * setting. 2427 * setting.
2420 * 2428 *
2421 * spp_dscp - This field is used in 2429 * spp_dscp - This field is used in conjunction with the SPP_DSCP flag
2422 * and contains the DSCP. 2430 * and contains the DSCP. The 6 most significant bits are
2423 * used for the DSCP. Th 2431 * used for the DSCP. This setting has precedence over any
2424 * IPv4- or IPv6- layer s 2432 * IPv4- or IPv6- layer setting.
2425 */ 2433 */
2426 static int sctp_apply_peer_addr_params(struct 2434 static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
2427 struct 2435 struct sctp_transport *trans,
2428 struct 2436 struct sctp_association *asoc,
2429 struct 2437 struct sctp_sock *sp,
2430 int 2438 int hb_change,
2431 int 2439 int pmtud_change,
2432 int 2440 int sackdelay_change)
2433 { 2441 {
2434 int error; 2442 int error;
2435 2443
2436 if (params->spp_flags & SPP_HB_DEMAND 2444 if (params->spp_flags & SPP_HB_DEMAND && trans) {
2437 error = sctp_primitive_REQUES 2445 error = sctp_primitive_REQUESTHEARTBEAT(trans->asoc->base.net,
2438 2446 trans->asoc, trans);
2439 if (error) 2447 if (error)
2440 return error; 2448 return error;
2441 } 2449 }
2442 2450
2443 /* Note that unless the spp_flag is s 2451 /* Note that unless the spp_flag is set to SPP_HB_ENABLE the value of
2444 * this field is ignored. Note also 2452 * this field is ignored. Note also that a value of zero indicates
2445 * the current setting should be left 2453 * the current setting should be left unchanged.
2446 */ 2454 */
2447 if (params->spp_flags & SPP_HB_ENABLE 2455 if (params->spp_flags & SPP_HB_ENABLE) {
2448 2456
2449 /* Re-zero the interval if th 2457 /* Re-zero the interval if the SPP_HB_TIME_IS_ZERO is
2450 * set. This lets us use 0 v 2458 * set. This lets us use 0 value when this flag
2451 * is set. 2459 * is set.
2452 */ 2460 */
2453 if (params->spp_flags & SPP_H 2461 if (params->spp_flags & SPP_HB_TIME_IS_ZERO)
2454 params->spp_hbinterva 2462 params->spp_hbinterval = 0;
2455 2463
2456 if (params->spp_hbinterval || 2464 if (params->spp_hbinterval ||
2457 (params->spp_flags & SPP_ 2465 (params->spp_flags & SPP_HB_TIME_IS_ZERO)) {
2458 if (trans) { 2466 if (trans) {
2459 trans->hbinte 2467 trans->hbinterval =
2460 msecs_to_ 2468 msecs_to_jiffies(params->spp_hbinterval);
2461 sctp_transpor <<
2462 } else if (asoc) { 2469 } else if (asoc) {
2463 asoc->hbinter 2470 asoc->hbinterval =
2464 msecs_to_ 2471 msecs_to_jiffies(params->spp_hbinterval);
2465 } else { 2472 } else {
2466 sp->hbinterva 2473 sp->hbinterval = params->spp_hbinterval;
2467 } 2474 }
2468 } 2475 }
2469 } 2476 }
2470 2477
2471 if (hb_change) { 2478 if (hb_change) {
2472 if (trans) { 2479 if (trans) {
2473 trans->param_flags = 2480 trans->param_flags =
2474 (trans->param 2481 (trans->param_flags & ~SPP_HB) | hb_change;
2475 } else if (asoc) { 2482 } else if (asoc) {
2476 asoc->param_flags = 2483 asoc->param_flags =
2477 (asoc->param_ 2484 (asoc->param_flags & ~SPP_HB) | hb_change;
2478 } else { 2485 } else {
2479 sp->param_flags = 2486 sp->param_flags =
2480 (sp->param_fl 2487 (sp->param_flags & ~SPP_HB) | hb_change;
2481 } 2488 }
2482 } 2489 }
2483 2490
2484 /* When Path MTU discovery is disable 2491 /* When Path MTU discovery is disabled the value specified here will
2485 * be the "fixed" path mtu (i.e. the 2492 * be the "fixed" path mtu (i.e. the value of the spp_flags field must
2486 * include the flag SPP_PMTUD_DISABLE 2493 * include the flag SPP_PMTUD_DISABLE for this field to have any
2487 * effect). 2494 * effect).
2488 */ 2495 */
2489 if ((params->spp_flags & SPP_PMTUD_DI 2496 if ((params->spp_flags & SPP_PMTUD_DISABLE) && params->spp_pathmtu) {
2490 if (trans) { 2497 if (trans) {
2491 trans->pathmtu = para 2498 trans->pathmtu = params->spp_pathmtu;
2492 sctp_assoc_sync_pmtu( 2499 sctp_assoc_sync_pmtu(asoc);
2493 } else if (asoc) { 2500 } else if (asoc) {
2494 sctp_assoc_set_pmtu(a 2501 sctp_assoc_set_pmtu(asoc, params->spp_pathmtu);
2495 } else { 2502 } else {
2496 sp->pathmtu = params- 2503 sp->pathmtu = params->spp_pathmtu;
2497 } 2504 }
2498 } 2505 }
2499 2506
2500 if (pmtud_change) { 2507 if (pmtud_change) {
2501 if (trans) { 2508 if (trans) {
2502 int update = (trans-> 2509 int update = (trans->param_flags & SPP_PMTUD_DISABLE) &&
2503 (params->spp_ 2510 (params->spp_flags & SPP_PMTUD_ENABLE);
2504 trans->param_flags = 2511 trans->param_flags =
2505 (trans->param 2512 (trans->param_flags & ~SPP_PMTUD) | pmtud_change;
2506 if (update) { 2513 if (update) {
2507 sctp_transpor 2514 sctp_transport_pmtu(trans, sctp_opt2sk(sp));
2508 sctp_assoc_sy 2515 sctp_assoc_sync_pmtu(asoc);
2509 } 2516 }
2510 sctp_transport_pl_res <<
2511 } else if (asoc) { 2517 } else if (asoc) {
2512 asoc->param_flags = 2518 asoc->param_flags =
2513 (asoc->param_ 2519 (asoc->param_flags & ~SPP_PMTUD) | pmtud_change;
2514 } else { 2520 } else {
2515 sp->param_flags = 2521 sp->param_flags =
2516 (sp->param_fl 2522 (sp->param_flags & ~SPP_PMTUD) | pmtud_change;
2517 } 2523 }
2518 } 2524 }
2519 2525
2520 /* Note that unless the spp_flag is s 2526 /* Note that unless the spp_flag is set to SPP_SACKDELAY_ENABLE the
2521 * value of this field is ignored. N 2527 * value of this field is ignored. Note also that a value of zero
2522 * indicates the current setting shou 2528 * indicates the current setting should be left unchanged.
2523 */ 2529 */
2524 if ((params->spp_flags & SPP_SACKDELA 2530 if ((params->spp_flags & SPP_SACKDELAY_ENABLE) && params->spp_sackdelay) {
2525 if (trans) { 2531 if (trans) {
2526 trans->sackdelay = 2532 trans->sackdelay =
2527 msecs_to_jiff 2533 msecs_to_jiffies(params->spp_sackdelay);
2528 } else if (asoc) { 2534 } else if (asoc) {
2529 asoc->sackdelay = 2535 asoc->sackdelay =
2530 msecs_to_jiff 2536 msecs_to_jiffies(params->spp_sackdelay);
2531 } else { 2537 } else {
2532 sp->sackdelay = param 2538 sp->sackdelay = params->spp_sackdelay;
2533 } 2539 }
2534 } 2540 }
2535 2541
2536 if (sackdelay_change) { 2542 if (sackdelay_change) {
2537 if (trans) { 2543 if (trans) {
2538 trans->param_flags = 2544 trans->param_flags =
2539 (trans->param 2545 (trans->param_flags & ~SPP_SACKDELAY) |
2540 sackdelay_cha 2546 sackdelay_change;
2541 } else if (asoc) { 2547 } else if (asoc) {
2542 asoc->param_flags = 2548 asoc->param_flags =
2543 (asoc->param_ 2549 (asoc->param_flags & ~SPP_SACKDELAY) |
2544 sackdelay_cha 2550 sackdelay_change;
2545 } else { 2551 } else {
2546 sp->param_flags = 2552 sp->param_flags =
2547 (sp->param_fl 2553 (sp->param_flags & ~SPP_SACKDELAY) |
2548 sackdelay_cha 2554 sackdelay_change;
2549 } 2555 }
2550 } 2556 }
2551 2557
2552 /* Note that a value of zero indicate 2558 /* Note that a value of zero indicates the current setting should be
2553 left unchanged. 2559 left unchanged.
2554 */ 2560 */
2555 if (params->spp_pathmaxrxt) { 2561 if (params->spp_pathmaxrxt) {
2556 if (trans) { 2562 if (trans) {
2557 trans->pathmaxrxt = p 2563 trans->pathmaxrxt = params->spp_pathmaxrxt;
2558 } else if (asoc) { 2564 } else if (asoc) {
2559 asoc->pathmaxrxt = pa 2565 asoc->pathmaxrxt = params->spp_pathmaxrxt;
2560 } else { 2566 } else {
2561 sp->pathmaxrxt = para 2567 sp->pathmaxrxt = params->spp_pathmaxrxt;
2562 } 2568 }
2563 } 2569 }
2564 2570
2565 if (params->spp_flags & SPP_IPV6_FLOW 2571 if (params->spp_flags & SPP_IPV6_FLOWLABEL) {
2566 if (trans) { 2572 if (trans) {
2567 if (trans->ipaddr.sa. 2573 if (trans->ipaddr.sa.sa_family == AF_INET6) {
2568 trans->flowla 2574 trans->flowlabel = params->spp_ipv6_flowlabel &
2569 2575 SCTP_FLOWLABEL_VAL_MASK;
2570 trans->flowla 2576 trans->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2571 } 2577 }
2572 } else if (asoc) { 2578 } else if (asoc) {
2573 struct sctp_transport 2579 struct sctp_transport *t;
2574 2580
2575 list_for_each_entry(t 2581 list_for_each_entry(t, &asoc->peer.transport_addr_list,
2576 t 2582 transports) {
2577 if (t->ipaddr 2583 if (t->ipaddr.sa.sa_family != AF_INET6)
2578 conti 2584 continue;
2579 t->flowlabel 2585 t->flowlabel = params->spp_ipv6_flowlabel &
2580 2586 SCTP_FLOWLABEL_VAL_MASK;
2581 t->flowlabel 2587 t->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2582 } 2588 }
2583 asoc->flowlabel = par 2589 asoc->flowlabel = params->spp_ipv6_flowlabel &
2584 SCT 2590 SCTP_FLOWLABEL_VAL_MASK;
2585 asoc->flowlabel |= SC 2591 asoc->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2586 } else if (sctp_opt2sk(sp)->s 2592 } else if (sctp_opt2sk(sp)->sk_family == AF_INET6) {
2587 sp->flowlabel = param 2593 sp->flowlabel = params->spp_ipv6_flowlabel &
2588 SCTP_ 2594 SCTP_FLOWLABEL_VAL_MASK;
2589 sp->flowlabel |= SCTP 2595 sp->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2590 } 2596 }
2591 } 2597 }
2592 2598
2593 if (params->spp_flags & SPP_DSCP) { 2599 if (params->spp_flags & SPP_DSCP) {
2594 if (trans) { 2600 if (trans) {
2595 trans->dscp = params- 2601 trans->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2596 trans->dscp |= SCTP_D 2602 trans->dscp |= SCTP_DSCP_SET_MASK;
2597 } else if (asoc) { 2603 } else if (asoc) {
2598 struct sctp_transport 2604 struct sctp_transport *t;
2599 2605
2600 list_for_each_entry(t 2606 list_for_each_entry(t, &asoc->peer.transport_addr_list,
2601 t 2607 transports) {
2602 t->dscp = par 2608 t->dscp = params->spp_dscp &
2603 SCT 2609 SCTP_DSCP_VAL_MASK;
2604 t->dscp |= SC 2610 t->dscp |= SCTP_DSCP_SET_MASK;
2605 } 2611 }
2606 asoc->dscp = params-> 2612 asoc->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2607 asoc->dscp |= SCTP_DS 2613 asoc->dscp |= SCTP_DSCP_SET_MASK;
2608 } else { 2614 } else {
2609 sp->dscp = params->sp 2615 sp->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2610 sp->dscp |= SCTP_DSCP 2616 sp->dscp |= SCTP_DSCP_SET_MASK;
2611 } 2617 }
2612 } 2618 }
2613 2619
2614 return 0; 2620 return 0;
2615 } 2621 }
2616 2622
2617 static int sctp_setsockopt_peer_addr_params(s 2623 static int sctp_setsockopt_peer_addr_params(struct sock *sk,
2618 s !! 2624 char __user *optval,
2619 u 2625 unsigned int optlen)
2620 { 2626 {
>> 2627 struct sctp_paddrparams params;
2621 struct sctp_transport *trans = NULL 2628 struct sctp_transport *trans = NULL;
2622 struct sctp_association *asoc = NULL; 2629 struct sctp_association *asoc = NULL;
2623 struct sctp_sock *sp = sctp_sk 2630 struct sctp_sock *sp = sctp_sk(sk);
2624 int error; 2631 int error;
2625 int hb_change, pmtud_change, sackdela 2632 int hb_change, pmtud_change, sackdelay_change;
2626 2633
2627 if (optlen == ALIGN(offsetof(struct s !! 2634 if (optlen == sizeof(params)) {
>> 2635 if (copy_from_user(¶ms, optval, optlen))
>> 2636 return -EFAULT;
>> 2637 } else if (optlen == ALIGN(offsetof(struct sctp_paddrparams,
2628 s 2638 spp_ipv6_flowlabel), 4)) {
2629 if (params->spp_flags & (SPP_ !! 2639 if (copy_from_user(¶ms, optval, optlen))
>> 2640 return -EFAULT;
>> 2641 if (params.spp_flags & (SPP_DSCP | SPP_IPV6_FLOWLABEL))
2630 return -EINVAL; 2642 return -EINVAL;
2631 } else if (optlen != sizeof(*params)) !! 2643 } else {
2632 return -EINVAL; 2644 return -EINVAL;
2633 } 2645 }
2634 2646
2635 /* Validate flags and value parameter 2647 /* Validate flags and value parameters. */
2636 hb_change = params->spp_flags !! 2648 hb_change = params.spp_flags & SPP_HB;
2637 pmtud_change = params->spp_flags !! 2649 pmtud_change = params.spp_flags & SPP_PMTUD;
2638 sackdelay_change = params->spp_flags !! 2650 sackdelay_change = params.spp_flags & SPP_SACKDELAY;
2639 2651
2640 if (hb_change == SPP_HB || 2652 if (hb_change == SPP_HB ||
2641 pmtud_change == SPP_PMTUD || 2653 pmtud_change == SPP_PMTUD ||
2642 sackdelay_change == SPP_SACKDELAY 2654 sackdelay_change == SPP_SACKDELAY ||
2643 params->spp_sackdelay > 500 || !! 2655 params.spp_sackdelay > 500 ||
2644 (params->spp_pathmtu && !! 2656 (params.spp_pathmtu &&
2645 params->spp_pathmtu < SCTP_DEFAU !! 2657 params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
2646 return -EINVAL; 2658 return -EINVAL;
2647 2659
2648 /* If an address other than INADDR_AN 2660 /* If an address other than INADDR_ANY is specified, and
2649 * no transport is found, then the re 2661 * no transport is found, then the request is invalid.
2650 */ 2662 */
2651 if (!sctp_is_any(sk, (union sctp_addr !! 2663 if (!sctp_is_any(sk, (union sctp_addr *)¶ms.spp_address)) {
2652 trans = sctp_addr_id2transpor !! 2664 trans = sctp_addr_id2transport(sk, ¶ms.spp_address,
2653 !! 2665 params.spp_assoc_id);
2654 if (!trans) 2666 if (!trans)
2655 return -EINVAL; 2667 return -EINVAL;
2656 } 2668 }
2657 2669
2658 /* Get association, if assoc_id != SC 2670 /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
2659 * socket is a one to many style sock 2671 * socket is a one to many style socket, and an association
2660 * was not found, then the id was inv 2672 * was not found, then the id was invalid.
2661 */ 2673 */
2662 asoc = sctp_id2assoc(sk, params->spp_ !! 2674 asoc = sctp_id2assoc(sk, params.spp_assoc_id);
2663 if (!asoc && params->spp_assoc_id != !! 2675 if (!asoc && params.spp_assoc_id != SCTP_FUTURE_ASSOC &&
2664 sctp_style(sk, UDP)) 2676 sctp_style(sk, UDP))
2665 return -EINVAL; 2677 return -EINVAL;
2666 2678
2667 /* Heartbeat demand can only be sent 2679 /* Heartbeat demand can only be sent on a transport or
2668 * association, but not a socket. 2680 * association, but not a socket.
2669 */ 2681 */
2670 if (params->spp_flags & SPP_HB_DEMAND !! 2682 if (params.spp_flags & SPP_HB_DEMAND && !trans && !asoc)
2671 return -EINVAL; 2683 return -EINVAL;
2672 2684
2673 /* Process parameters. */ 2685 /* Process parameters. */
2674 error = sctp_apply_peer_addr_params(p !! 2686 error = sctp_apply_peer_addr_params(¶ms, trans, asoc, sp,
2675 h 2687 hb_change, pmtud_change,
2676 s 2688 sackdelay_change);
2677 2689
2678 if (error) 2690 if (error)
2679 return error; 2691 return error;
2680 2692
2681 /* If changes are for association, al 2693 /* If changes are for association, also apply parameters to each
2682 * transport. 2694 * transport.
2683 */ 2695 */
2684 if (!trans && asoc) { 2696 if (!trans && asoc) {
2685 list_for_each_entry(trans, &a 2697 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
2686 transports) { 2698 transports) {
2687 sctp_apply_peer_addr_ !! 2699 sctp_apply_peer_addr_params(¶ms, trans, asoc, sp,
2688 2700 hb_change, pmtud_change,
2689 2701 sackdelay_change);
2690 } 2702 }
2691 } 2703 }
2692 2704
2693 return 0; 2705 return 0;
2694 } 2706 }
2695 2707
2696 static inline __u32 sctp_spp_sackdelay_enable 2708 static inline __u32 sctp_spp_sackdelay_enable(__u32 param_flags)
2697 { 2709 {
2698 return (param_flags & ~SPP_SACKDELAY) 2710 return (param_flags & ~SPP_SACKDELAY) | SPP_SACKDELAY_ENABLE;
2699 } 2711 }
2700 2712
2701 static inline __u32 sctp_spp_sackdelay_disabl 2713 static inline __u32 sctp_spp_sackdelay_disable(__u32 param_flags)
2702 { 2714 {
2703 return (param_flags & ~SPP_SACKDELAY) 2715 return (param_flags & ~SPP_SACKDELAY) | SPP_SACKDELAY_DISABLE;
2704 } 2716 }
2705 2717
2706 static void sctp_apply_asoc_delayed_ack(struc 2718 static void sctp_apply_asoc_delayed_ack(struct sctp_sack_info *params,
2707 struc 2719 struct sctp_association *asoc)
2708 { 2720 {
2709 struct sctp_transport *trans; 2721 struct sctp_transport *trans;
2710 2722
2711 if (params->sack_delay) { 2723 if (params->sack_delay) {
2712 asoc->sackdelay = msecs_to_ji 2724 asoc->sackdelay = msecs_to_jiffies(params->sack_delay);
2713 asoc->param_flags = 2725 asoc->param_flags =
2714 sctp_spp_sackdelay_en 2726 sctp_spp_sackdelay_enable(asoc->param_flags);
2715 } 2727 }
2716 if (params->sack_freq == 1) { 2728 if (params->sack_freq == 1) {
2717 asoc->param_flags = 2729 asoc->param_flags =
2718 sctp_spp_sackdelay_di 2730 sctp_spp_sackdelay_disable(asoc->param_flags);
2719 } else if (params->sack_freq > 1) { 2731 } else if (params->sack_freq > 1) {
2720 asoc->sackfreq = params->sack 2732 asoc->sackfreq = params->sack_freq;
2721 asoc->param_flags = 2733 asoc->param_flags =
2722 sctp_spp_sackdelay_en 2734 sctp_spp_sackdelay_enable(asoc->param_flags);
2723 } 2735 }
2724 2736
2725 list_for_each_entry(trans, &asoc->pee 2737 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
2726 transports) { 2738 transports) {
2727 if (params->sack_delay) { 2739 if (params->sack_delay) {
2728 trans->sackdelay = ms 2740 trans->sackdelay = msecs_to_jiffies(params->sack_delay);
2729 trans->param_flags = 2741 trans->param_flags =
2730 sctp_spp_sack 2742 sctp_spp_sackdelay_enable(trans->param_flags);
2731 } 2743 }
2732 if (params->sack_freq == 1) { 2744 if (params->sack_freq == 1) {
2733 trans->param_flags = 2745 trans->param_flags =
2734 sctp_spp_sack 2746 sctp_spp_sackdelay_disable(trans->param_flags);
2735 } else if (params->sack_freq 2747 } else if (params->sack_freq > 1) {
2736 trans->sackfreq = par 2748 trans->sackfreq = params->sack_freq;
2737 trans->param_flags = 2749 trans->param_flags =
2738 sctp_spp_sack 2750 sctp_spp_sackdelay_enable(trans->param_flags);
2739 } 2751 }
2740 } 2752 }
2741 } 2753 }
2742 2754
2743 /* 2755 /*
2744 * 7.1.23. Get or set delayed ack timer (SCT 2756 * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK)
2745 * 2757 *
2746 * This option will effect the way delayed ac 2758 * This option will effect the way delayed acks are performed. This
2747 * option allows you to get or set the delaye 2759 * option allows you to get or set the delayed ack time, in
2748 * milliseconds. It also allows changing the 2760 * milliseconds. It also allows changing the delayed ack frequency.
2749 * Changing the frequency to 1 disables the d 2761 * Changing the frequency to 1 disables the delayed sack algorithm. If
2750 * the assoc_id is 0, then this sets or gets 2762 * the assoc_id is 0, then this sets or gets the endpoints default
2751 * values. If the assoc_id field is non-zero 2763 * values. If the assoc_id field is non-zero, then the set or get
2752 * effects the specified association for the 2764 * effects the specified association for the one to many model (the
2753 * assoc_id field is ignored by the one to on 2765 * assoc_id field is ignored by the one to one model). Note that if
2754 * sack_delay or sack_freq are 0 when setting 2766 * sack_delay or sack_freq are 0 when setting this option, then the
2755 * current values will remain unchanged. 2767 * current values will remain unchanged.
2756 * 2768 *
2757 * struct sctp_sack_info { 2769 * struct sctp_sack_info {
2758 * sctp_assoc_t sack_assoc_id; 2770 * sctp_assoc_t sack_assoc_id;
2759 * uint32_t sack_delay; 2771 * uint32_t sack_delay;
2760 * uint32_t sack_freq; 2772 * uint32_t sack_freq;
2761 * }; 2773 * };
2762 * 2774 *
2763 * sack_assoc_id - This parameter, indicates 2775 * sack_assoc_id - This parameter, indicates which association the user
2764 * is performing an action upon. Note tha 2776 * is performing an action upon. Note that if this field's value is
2765 * zero then the endpoints default value i 2777 * zero then the endpoints default value is changed (effecting future
2766 * associations only). 2778 * associations only).
2767 * 2779 *
2768 * sack_delay - This parameter contains the 2780 * sack_delay - This parameter contains the number of milliseconds that
2769 * the user is requesting the delayed ACK 2781 * the user is requesting the delayed ACK timer be set to. Note that
2770 * this value is defined in the standard t 2782 * this value is defined in the standard to be between 200 and 500
2771 * milliseconds. 2783 * milliseconds.
2772 * 2784 *
2773 * sack_freq - This parameter contains the n 2785 * sack_freq - This parameter contains the number of packets that must
2774 * be received before a sack is sent witho 2786 * be received before a sack is sent without waiting for the delay
2775 * timer to expire. The default value for 2787 * timer to expire. The default value for this is 2, setting this
2776 * value to 1 will disable the delayed sac 2788 * value to 1 will disable the delayed sack algorithm.
2777 */ 2789 */
2778 static int __sctp_setsockopt_delayed_ack(stru !! 2790
2779 stru !! 2791 static int sctp_setsockopt_delayed_ack(struct sock *sk,
>> 2792 char __user *optval, unsigned int optlen)
2780 { 2793 {
2781 struct sctp_sock *sp = sctp_sk(sk); 2794 struct sctp_sock *sp = sctp_sk(sk);
2782 struct sctp_association *asoc; 2795 struct sctp_association *asoc;
>> 2796 struct sctp_sack_info params;
>> 2797
>> 2798 if (optlen == sizeof(struct sctp_sack_info)) {
>> 2799 if (copy_from_user(¶ms, optval, optlen))
>> 2800 return -EFAULT;
>> 2801
>> 2802 if (params.sack_delay == 0 && params.sack_freq == 0)
>> 2803 return 0;
>> 2804 } else if (optlen == sizeof(struct sctp_assoc_value)) {
>> 2805 pr_warn_ratelimited(DEPRECATED
>> 2806 "%s (pid %d) "
>> 2807 "Use of struct sctp_assoc_value in delayed_ack socket option.\n"
>> 2808 "Use struct sctp_sack_info instead\n",
>> 2809 current->comm, task_pid_nr(current));
>> 2810 if (copy_from_user(¶ms, optval, optlen))
>> 2811 return -EFAULT;
>> 2812
>> 2813 if (params.sack_delay == 0)
>> 2814 params.sack_freq = 1;
>> 2815 else
>> 2816 params.sack_freq = 0;
>> 2817 } else
>> 2818 return -EINVAL;
2783 2819
2784 /* Validate value parameter. */ 2820 /* Validate value parameter. */
2785 if (params->sack_delay > 500) !! 2821 if (params.sack_delay > 500)
2786 return -EINVAL; 2822 return -EINVAL;
2787 2823
2788 /* Get association, if sack_assoc_id 2824 /* Get association, if sack_assoc_id != SCTP_FUTURE_ASSOC and the
2789 * socket is a one to many style sock 2825 * socket is a one to many style socket, and an association
2790 * was not found, then the id was inv 2826 * was not found, then the id was invalid.
2791 */ 2827 */
2792 asoc = sctp_id2assoc(sk, params->sack !! 2828 asoc = sctp_id2assoc(sk, params.sack_assoc_id);
2793 if (!asoc && params->sack_assoc_id > !! 2829 if (!asoc && params.sack_assoc_id > SCTP_ALL_ASSOC &&
2794 sctp_style(sk, UDP)) 2830 sctp_style(sk, UDP))
2795 return -EINVAL; 2831 return -EINVAL;
2796 2832
2797 if (asoc) { 2833 if (asoc) {
2798 sctp_apply_asoc_delayed_ack(p !! 2834 sctp_apply_asoc_delayed_ack(¶ms, asoc);
2799 2835
2800 return 0; 2836 return 0;
2801 } 2837 }
2802 2838
2803 if (sctp_style(sk, TCP)) 2839 if (sctp_style(sk, TCP))
2804 params->sack_assoc_id = SCTP_ !! 2840 params.sack_assoc_id = SCTP_FUTURE_ASSOC;
2805 2841
2806 if (params->sack_assoc_id == SCTP_FUT !! 2842 if (params.sack_assoc_id == SCTP_FUTURE_ASSOC ||
2807 params->sack_assoc_id == SCTP_ALL !! 2843 params.sack_assoc_id == SCTP_ALL_ASSOC) {
2808 if (params->sack_delay) { !! 2844 if (params.sack_delay) {
2809 sp->sackdelay = param !! 2845 sp->sackdelay = params.sack_delay;
2810 sp->param_flags = 2846 sp->param_flags =
2811 sctp_spp_sack 2847 sctp_spp_sackdelay_enable(sp->param_flags);
2812 } 2848 }
2813 if (params->sack_freq == 1) { !! 2849 if (params.sack_freq == 1) {
2814 sp->param_flags = 2850 sp->param_flags =
2815 sctp_spp_sack 2851 sctp_spp_sackdelay_disable(sp->param_flags);
2816 } else if (params->sack_freq !! 2852 } else if (params.sack_freq > 1) {
2817 sp->sackfreq = params !! 2853 sp->sackfreq = params.sack_freq;
2818 sp->param_flags = 2854 sp->param_flags =
2819 sctp_spp_sack 2855 sctp_spp_sackdelay_enable(sp->param_flags);
2820 } 2856 }
2821 } 2857 }
2822 2858
2823 if (params->sack_assoc_id == SCTP_CUR !! 2859 if (params.sack_assoc_id == SCTP_CURRENT_ASSOC ||
2824 params->sack_assoc_id == SCTP_ALL !! 2860 params.sack_assoc_id == SCTP_ALL_ASSOC)
2825 list_for_each_entry(asoc, &sp 2861 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
2826 sctp_apply_asoc_delay !! 2862 sctp_apply_asoc_delayed_ack(¶ms, asoc);
2827 2863
2828 return 0; 2864 return 0;
2829 } 2865 }
2830 2866
2831 static int sctp_setsockopt_delayed_ack(struct <<
2832 struct <<
2833 unsign <<
2834 { <<
2835 if (optlen == sizeof(struct sctp_asso <<
2836 struct sctp_assoc_value *v = <<
2837 struct sctp_sack_info p; <<
2838 <<
2839 pr_warn_ratelimited(DEPRECATE <<
2840 "%s (pid <<
2841 "Use of s <<
2842 "Use stru <<
2843 current-> <<
2844 <<
2845 p.sack_assoc_id = v->assoc_id <<
2846 p.sack_delay = v->assoc_value <<
2847 p.sack_freq = v->assoc_value <<
2848 return __sctp_setsockopt_dela <<
2849 } <<
2850 <<
2851 if (optlen != sizeof(struct sctp_sack <<
2852 return -EINVAL; <<
2853 if (params->sack_delay == 0 && params <<
2854 return 0; <<
2855 return __sctp_setsockopt_delayed_ack( <<
2856 } <<
2857 <<
2858 /* 7.1.3 Initialization Parameters (SCTP_INIT 2867 /* 7.1.3 Initialization Parameters (SCTP_INITMSG)
2859 * 2868 *
2860 * Applications can specify protocol paramete 2869 * Applications can specify protocol parameters for the default association
2861 * initialization. The option name argument 2870 * initialization. The option name argument to setsockopt() and getsockopt()
2862 * is SCTP_INITMSG. 2871 * is SCTP_INITMSG.
2863 * 2872 *
2864 * Setting initialization parameters is effec 2873 * Setting initialization parameters is effective only on an unconnected
2865 * socket (for UDP-style sockets only future 2874 * socket (for UDP-style sockets only future associations are effected
2866 * by the change). With TCP-style sockets, t 2875 * by the change). With TCP-style sockets, this option is inherited by
2867 * sockets derived from a listener socket. 2876 * sockets derived from a listener socket.
2868 */ 2877 */
2869 static int sctp_setsockopt_initmsg(struct soc !! 2878 static int sctp_setsockopt_initmsg(struct sock *sk, char __user *optval, unsigned int optlen)
2870 unsigned i <<
2871 { 2879 {
>> 2880 struct sctp_initmsg sinit;
2872 struct sctp_sock *sp = sctp_sk(sk); 2881 struct sctp_sock *sp = sctp_sk(sk);
2873 2882
2874 if (optlen != sizeof(struct sctp_init 2883 if (optlen != sizeof(struct sctp_initmsg))
2875 return -EINVAL; 2884 return -EINVAL;
>> 2885 if (copy_from_user(&sinit, optval, optlen))
>> 2886 return -EFAULT;
2876 2887
2877 if (sinit->sinit_num_ostreams) !! 2888 if (sinit.sinit_num_ostreams)
2878 sp->initmsg.sinit_num_ostream !! 2889 sp->initmsg.sinit_num_ostreams = sinit.sinit_num_ostreams;
2879 if (sinit->sinit_max_instreams) !! 2890 if (sinit.sinit_max_instreams)
2880 sp->initmsg.sinit_max_instrea !! 2891 sp->initmsg.sinit_max_instreams = sinit.sinit_max_instreams;
2881 if (sinit->sinit_max_attempts) !! 2892 if (sinit.sinit_max_attempts)
2882 sp->initmsg.sinit_max_attempt !! 2893 sp->initmsg.sinit_max_attempts = sinit.sinit_max_attempts;
2883 if (sinit->sinit_max_init_timeo) !! 2894 if (sinit.sinit_max_init_timeo)
2884 sp->initmsg.sinit_max_init_ti !! 2895 sp->initmsg.sinit_max_init_timeo = sinit.sinit_max_init_timeo;
2885 2896
2886 return 0; 2897 return 0;
2887 } 2898 }
2888 2899
2889 /* 2900 /*
2890 * 7.1.14 Set default send parameters (SCTP_D 2901 * 7.1.14 Set default send parameters (SCTP_DEFAULT_SEND_PARAM)
2891 * 2902 *
2892 * Applications that wish to use the sendto 2903 * Applications that wish to use the sendto() system call may wish to
2893 * specify a default set of parameters that 2904 * specify a default set of parameters that would normally be supplied
2894 * through the inclusion of ancillary data. 2905 * through the inclusion of ancillary data. This socket option allows
2895 * such an application to set the default s 2906 * such an application to set the default sctp_sndrcvinfo structure.
2896 * The application that wishes to use this 2907 * The application that wishes to use this socket option simply passes
2897 * in to this call the sctp_sndrcvinfo stru 2908 * in to this call the sctp_sndrcvinfo structure defined in Section
2898 * 5.2.2) The input parameters accepted by 2909 * 5.2.2) The input parameters accepted by this call include
2899 * sinfo_stream, sinfo_flags, sinfo_ppid, s 2910 * sinfo_stream, sinfo_flags, sinfo_ppid, sinfo_context,
2900 * sinfo_timetolive. The user must provide 2911 * sinfo_timetolive. The user must provide the sinfo_assoc_id field in
2901 * to this call if the caller is using the 2912 * to this call if the caller is using the UDP model.
2902 */ 2913 */
2903 static int sctp_setsockopt_default_send_param 2914 static int sctp_setsockopt_default_send_param(struct sock *sk,
2904 !! 2915 char __user *optval,
2905 2916 unsigned int optlen)
2906 { 2917 {
2907 struct sctp_sock *sp = sctp_sk(sk); 2918 struct sctp_sock *sp = sctp_sk(sk);
2908 struct sctp_association *asoc; 2919 struct sctp_association *asoc;
>> 2920 struct sctp_sndrcvinfo info;
2909 2921
2910 if (optlen != sizeof(*info)) !! 2922 if (optlen != sizeof(info))
2911 return -EINVAL; 2923 return -EINVAL;
2912 if (info->sinfo_flags & !! 2924 if (copy_from_user(&info, optval, optlen))
>> 2925 return -EFAULT;
>> 2926 if (info.sinfo_flags &
2913 ~(SCTP_UNORDERED | SCTP_ADDR_OVER 2927 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
2914 SCTP_ABORT | SCTP_EOF)) 2928 SCTP_ABORT | SCTP_EOF))
2915 return -EINVAL; 2929 return -EINVAL;
2916 2930
2917 asoc = sctp_id2assoc(sk, info->sinfo_ !! 2931 asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
2918 if (!asoc && info->sinfo_assoc_id > S !! 2932 if (!asoc && info.sinfo_assoc_id > SCTP_ALL_ASSOC &&
2919 sctp_style(sk, UDP)) 2933 sctp_style(sk, UDP))
2920 return -EINVAL; 2934 return -EINVAL;
2921 2935
2922 if (asoc) { 2936 if (asoc) {
2923 asoc->default_stream = info-> !! 2937 asoc->default_stream = info.sinfo_stream;
2924 asoc->default_flags = info->s !! 2938 asoc->default_flags = info.sinfo_flags;
2925 asoc->default_ppid = info->si !! 2939 asoc->default_ppid = info.sinfo_ppid;
2926 asoc->default_context = info- !! 2940 asoc->default_context = info.sinfo_context;
2927 asoc->default_timetolive = in !! 2941 asoc->default_timetolive = info.sinfo_timetolive;
2928 2942
2929 return 0; 2943 return 0;
2930 } 2944 }
2931 2945
2932 if (sctp_style(sk, TCP)) 2946 if (sctp_style(sk, TCP))
2933 info->sinfo_assoc_id = SCTP_F !! 2947 info.sinfo_assoc_id = SCTP_FUTURE_ASSOC;
2934 2948
2935 if (info->sinfo_assoc_id == SCTP_FUTU !! 2949 if (info.sinfo_assoc_id == SCTP_FUTURE_ASSOC ||
2936 info->sinfo_assoc_id == SCTP_ALL_ !! 2950 info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2937 sp->default_stream = info->si !! 2951 sp->default_stream = info.sinfo_stream;
2938 sp->default_flags = info->sin !! 2952 sp->default_flags = info.sinfo_flags;
2939 sp->default_ppid = info->sinf !! 2953 sp->default_ppid = info.sinfo_ppid;
2940 sp->default_context = info->s !! 2954 sp->default_context = info.sinfo_context;
2941 sp->default_timetolive = info !! 2955 sp->default_timetolive = info.sinfo_timetolive;
2942 } 2956 }
2943 2957
2944 if (info->sinfo_assoc_id == SCTP_CURR !! 2958 if (info.sinfo_assoc_id == SCTP_CURRENT_ASSOC ||
2945 info->sinfo_assoc_id == SCTP_ALL_ !! 2959 info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2946 list_for_each_entry(asoc, &sp 2960 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
2947 asoc->default_stream !! 2961 asoc->default_stream = info.sinfo_stream;
2948 asoc->default_flags = !! 2962 asoc->default_flags = info.sinfo_flags;
2949 asoc->default_ppid = !! 2963 asoc->default_ppid = info.sinfo_ppid;
2950 asoc->default_context !! 2964 asoc->default_context = info.sinfo_context;
2951 asoc->default_timetol !! 2965 asoc->default_timetolive = info.sinfo_timetolive;
2952 } 2966 }
2953 } 2967 }
2954 2968
2955 return 0; 2969 return 0;
2956 } 2970 }
2957 2971
2958 /* RFC6458, Section 8.1.31. Set/get Default S 2972 /* RFC6458, Section 8.1.31. Set/get Default Send Parameters
2959 * (SCTP_DEFAULT_SNDINFO) 2973 * (SCTP_DEFAULT_SNDINFO)
2960 */ 2974 */
2961 static int sctp_setsockopt_default_sndinfo(st 2975 static int sctp_setsockopt_default_sndinfo(struct sock *sk,
2962 st !! 2976 char __user *optval,
2963 un 2977 unsigned int optlen)
2964 { 2978 {
2965 struct sctp_sock *sp = sctp_sk(sk); 2979 struct sctp_sock *sp = sctp_sk(sk);
2966 struct sctp_association *asoc; 2980 struct sctp_association *asoc;
>> 2981 struct sctp_sndinfo info;
2967 2982
2968 if (optlen != sizeof(*info)) !! 2983 if (optlen != sizeof(info))
2969 return -EINVAL; 2984 return -EINVAL;
2970 if (info->snd_flags & !! 2985 if (copy_from_user(&info, optval, optlen))
>> 2986 return -EFAULT;
>> 2987 if (info.snd_flags &
2971 ~(SCTP_UNORDERED | SCTP_ADDR_OVER 2988 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
2972 SCTP_ABORT | SCTP_EOF)) 2989 SCTP_ABORT | SCTP_EOF))
2973 return -EINVAL; 2990 return -EINVAL;
2974 2991
2975 asoc = sctp_id2assoc(sk, info->snd_as !! 2992 asoc = sctp_id2assoc(sk, info.snd_assoc_id);
2976 if (!asoc && info->snd_assoc_id > SCT !! 2993 if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC &&
2977 sctp_style(sk, UDP)) 2994 sctp_style(sk, UDP))
2978 return -EINVAL; 2995 return -EINVAL;
2979 2996
2980 if (asoc) { 2997 if (asoc) {
2981 asoc->default_stream = info-> !! 2998 asoc->default_stream = info.snd_sid;
2982 asoc->default_flags = info->s !! 2999 asoc->default_flags = info.snd_flags;
2983 asoc->default_ppid = info->sn !! 3000 asoc->default_ppid = info.snd_ppid;
2984 asoc->default_context = info- !! 3001 asoc->default_context = info.snd_context;
2985 3002
2986 return 0; 3003 return 0;
2987 } 3004 }
2988 3005
2989 if (sctp_style(sk, TCP)) 3006 if (sctp_style(sk, TCP))
2990 info->snd_assoc_id = SCTP_FUT !! 3007 info.snd_assoc_id = SCTP_FUTURE_ASSOC;
2991 3008
2992 if (info->snd_assoc_id == SCTP_FUTURE !! 3009 if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||
2993 info->snd_assoc_id == SCTP_ALL_AS !! 3010 info.snd_assoc_id == SCTP_ALL_ASSOC) {
2994 sp->default_stream = info->sn !! 3011 sp->default_stream = info.snd_sid;
2995 sp->default_flags = info->snd !! 3012 sp->default_flags = info.snd_flags;
2996 sp->default_ppid = info->snd_ !! 3013 sp->default_ppid = info.snd_ppid;
2997 sp->default_context = info->s !! 3014 sp->default_context = info.snd_context;
2998 } 3015 }
2999 3016
3000 if (info->snd_assoc_id == SCTP_CURREN !! 3017 if (info.snd_assoc_id == SCTP_CURRENT_ASSOC ||
3001 info->snd_assoc_id == SCTP_ALL_AS !! 3018 info.snd_assoc_id == SCTP_ALL_ASSOC) {
3002 list_for_each_entry(asoc, &sp 3019 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
3003 asoc->default_stream !! 3020 asoc->default_stream = info.snd_sid;
3004 asoc->default_flags = !! 3021 asoc->default_flags = info.snd_flags;
3005 asoc->default_ppid = !! 3022 asoc->default_ppid = info.snd_ppid;
3006 asoc->default_context !! 3023 asoc->default_context = info.snd_context;
3007 } 3024 }
3008 } 3025 }
3009 3026
3010 return 0; 3027 return 0;
3011 } 3028 }
3012 3029
3013 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_A 3030 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
3014 * 3031 *
3015 * Requests that the local SCTP stack use the 3032 * Requests that the local SCTP stack use the enclosed peer address as
3016 * the association primary. The enclosed add 3033 * the association primary. The enclosed address must be one of the
3017 * association peer's addresses. 3034 * association peer's addresses.
3018 */ 3035 */
3019 static int sctp_setsockopt_primary_addr(struc !! 3036 static int sctp_setsockopt_primary_addr(struct sock *sk, char __user *optval,
3020 unsig 3037 unsigned int optlen)
3021 { 3038 {
>> 3039 struct sctp_prim prim;
3022 struct sctp_transport *trans; 3040 struct sctp_transport *trans;
3023 struct sctp_af *af; 3041 struct sctp_af *af;
3024 int err; 3042 int err;
3025 3043
3026 if (optlen != sizeof(struct sctp_prim 3044 if (optlen != sizeof(struct sctp_prim))
3027 return -EINVAL; 3045 return -EINVAL;
3028 3046
>> 3047 if (copy_from_user(&prim, optval, sizeof(struct sctp_prim)))
>> 3048 return -EFAULT;
>> 3049
3029 /* Allow security module to validate 3050 /* Allow security module to validate address but need address len. */
3030 af = sctp_get_af_specific(prim->ssp_a !! 3051 af = sctp_get_af_specific(prim.ssp_addr.ss_family);
3031 if (!af) 3052 if (!af)
3032 return -EINVAL; 3053 return -EINVAL;
3033 3054
3034 err = security_sctp_bind_connect(sk, 3055 err = security_sctp_bind_connect(sk, SCTP_PRIMARY_ADDR,
3035 (str !! 3056 (struct sockaddr *)&prim.ssp_addr,
3036 af-> 3057 af->sockaddr_len);
3037 if (err) 3058 if (err)
3038 return err; 3059 return err;
3039 3060
3040 trans = sctp_addr_id2transport(sk, &p !! 3061 trans = sctp_addr_id2transport(sk, &prim.ssp_addr, prim.ssp_assoc_id);
3041 if (!trans) 3062 if (!trans)
3042 return -EINVAL; 3063 return -EINVAL;
3043 3064
3044 sctp_assoc_set_primary(trans->asoc, t 3065 sctp_assoc_set_primary(trans->asoc, trans);
3045 3066
3046 return 0; 3067 return 0;
3047 } 3068 }
3048 3069
3049 /* 3070 /*
3050 * 7.1.5 SCTP_NODELAY 3071 * 7.1.5 SCTP_NODELAY
3051 * 3072 *
3052 * Turn on/off any Nagle-like algorithm. Thi 3073 * Turn on/off any Nagle-like algorithm. This means that packets are
3053 * generally sent as soon as possible and no 3074 * generally sent as soon as possible and no unnecessary delays are
3054 * introduced, at the cost of more packets in 3075 * introduced, at the cost of more packets in the network. Expects an
3055 * integer boolean flag. 3076 * integer boolean flag.
3056 */ 3077 */
3057 static int sctp_setsockopt_nodelay(struct soc !! 3078 static int sctp_setsockopt_nodelay(struct sock *sk, char __user *optval,
3058 unsigned i 3079 unsigned int optlen)
3059 { 3080 {
>> 3081 int val;
>> 3082
3060 if (optlen < sizeof(int)) 3083 if (optlen < sizeof(int))
3061 return -EINVAL; 3084 return -EINVAL;
3062 sctp_sk(sk)->nodelay = (*val == 0) ? !! 3085 if (get_user(val, (int __user *)optval))
>> 3086 return -EFAULT;
>> 3087
>> 3088 sctp_sk(sk)->nodelay = (val == 0) ? 0 : 1;
3063 return 0; 3089 return 0;
3064 } 3090 }
3065 3091
3066 /* 3092 /*
3067 * 3093 *
3068 * 7.1.1 SCTP_RTOINFO 3094 * 7.1.1 SCTP_RTOINFO
3069 * 3095 *
3070 * The protocol parameters used to initialize 3096 * The protocol parameters used to initialize and bound retransmission
3071 * timeout (RTO) are tunable. sctp_rtoinfo st 3097 * timeout (RTO) are tunable. sctp_rtoinfo structure is used to access
3072 * and modify these parameters. 3098 * and modify these parameters.
3073 * All parameters are time values, in millise 3099 * All parameters are time values, in milliseconds. A value of 0, when
3074 * modifying the parameters, indicates that t 3100 * modifying the parameters, indicates that the current value should not
3075 * be changed. 3101 * be changed.
3076 * 3102 *
3077 */ 3103 */
3078 static int sctp_setsockopt_rtoinfo(struct soc !! 3104 static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigned int optlen)
3079 struct sct <<
3080 unsigned i <<
3081 { 3105 {
>> 3106 struct sctp_rtoinfo rtoinfo;
3082 struct sctp_association *asoc; 3107 struct sctp_association *asoc;
3083 unsigned long rto_min, rto_max; 3108 unsigned long rto_min, rto_max;
3084 struct sctp_sock *sp = sctp_sk(sk); 3109 struct sctp_sock *sp = sctp_sk(sk);
3085 3110
3086 if (optlen != sizeof (struct sctp_rto 3111 if (optlen != sizeof (struct sctp_rtoinfo))
3087 return -EINVAL; 3112 return -EINVAL;
3088 3113
3089 asoc = sctp_id2assoc(sk, rtoinfo->srt !! 3114 if (copy_from_user(&rtoinfo, optval, optlen))
>> 3115 return -EFAULT;
>> 3116
>> 3117 asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
3090 3118
3091 /* Set the values to the specific ass 3119 /* Set the values to the specific association */
3092 if (!asoc && rtoinfo->srto_assoc_id ! !! 3120 if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
3093 sctp_style(sk, UDP)) 3121 sctp_style(sk, UDP))
3094 return -EINVAL; 3122 return -EINVAL;
3095 3123
3096 rto_max = rtoinfo->srto_max; !! 3124 rto_max = rtoinfo.srto_max;
3097 rto_min = rtoinfo->srto_min; !! 3125 rto_min = rtoinfo.srto_min;
3098 3126
3099 if (rto_max) 3127 if (rto_max)
3100 rto_max = asoc ? msecs_to_jif 3128 rto_max = asoc ? msecs_to_jiffies(rto_max) : rto_max;
3101 else 3129 else
3102 rto_max = asoc ? asoc->rto_ma 3130 rto_max = asoc ? asoc->rto_max : sp->rtoinfo.srto_max;
3103 3131
3104 if (rto_min) 3132 if (rto_min)
3105 rto_min = asoc ? msecs_to_jif 3133 rto_min = asoc ? msecs_to_jiffies(rto_min) : rto_min;
3106 else 3134 else
3107 rto_min = asoc ? asoc->rto_mi 3135 rto_min = asoc ? asoc->rto_min : sp->rtoinfo.srto_min;
3108 3136
3109 if (rto_min > rto_max) 3137 if (rto_min > rto_max)
3110 return -EINVAL; 3138 return -EINVAL;
3111 3139
3112 if (asoc) { 3140 if (asoc) {
3113 if (rtoinfo->srto_initial != !! 3141 if (rtoinfo.srto_initial != 0)
3114 asoc->rto_initial = 3142 asoc->rto_initial =
3115 msecs_to_jiff !! 3143 msecs_to_jiffies(rtoinfo.srto_initial);
3116 asoc->rto_max = rto_max; 3144 asoc->rto_max = rto_max;
3117 asoc->rto_min = rto_min; 3145 asoc->rto_min = rto_min;
3118 } else { 3146 } else {
3119 /* If there is no association 3147 /* If there is no association or the association-id = 0
3120 * set the values to the endp 3148 * set the values to the endpoint.
3121 */ 3149 */
3122 if (rtoinfo->srto_initial != !! 3150 if (rtoinfo.srto_initial != 0)
3123 sp->rtoinfo.srto_init !! 3151 sp->rtoinfo.srto_initial = rtoinfo.srto_initial;
3124 sp->rtoinfo.srto_max = rto_ma 3152 sp->rtoinfo.srto_max = rto_max;
3125 sp->rtoinfo.srto_min = rto_mi 3153 sp->rtoinfo.srto_min = rto_min;
3126 } 3154 }
3127 3155
3128 return 0; 3156 return 0;
3129 } 3157 }
3130 3158
3131 /* 3159 /*
3132 * 3160 *
3133 * 7.1.2 SCTP_ASSOCINFO 3161 * 7.1.2 SCTP_ASSOCINFO
3134 * 3162 *
3135 * This option is used to tune the maximum re 3163 * This option is used to tune the maximum retransmission attempts
3136 * of the association. 3164 * of the association.
3137 * Returns an error if the new association re 3165 * Returns an error if the new association retransmission value is
3138 * greater than the sum of the retransmission 3166 * greater than the sum of the retransmission value of the peer.
3139 * See [SCTP] for more information. 3167 * See [SCTP] for more information.
3140 * 3168 *
3141 */ 3169 */
3142 static int sctp_setsockopt_associnfo(struct s !! 3170 static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, unsigned int optlen)
3143 struct s <<
3144 unsigned <<
3145 { 3171 {
3146 3172
>> 3173 struct sctp_assocparams assocparams;
3147 struct sctp_association *asoc; 3174 struct sctp_association *asoc;
3148 3175
3149 if (optlen != sizeof(struct sctp_asso 3176 if (optlen != sizeof(struct sctp_assocparams))
3150 return -EINVAL; 3177 return -EINVAL;
>> 3178 if (copy_from_user(&assocparams, optval, optlen))
>> 3179 return -EFAULT;
3151 3180
3152 asoc = sctp_id2assoc(sk, assocparams- !! 3181 asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
3153 3182
3154 if (!asoc && assocparams->sasoc_assoc !! 3183 if (!asoc && assocparams.sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
3155 sctp_style(sk, UDP)) 3184 sctp_style(sk, UDP))
3156 return -EINVAL; 3185 return -EINVAL;
3157 3186
3158 /* Set the values to the specific ass 3187 /* Set the values to the specific association */
3159 if (asoc) { 3188 if (asoc) {
3160 if (assocparams->sasoc_asocma !! 3189 if (assocparams.sasoc_asocmaxrxt != 0) {
3161 __u32 path_sum = 0; 3190 __u32 path_sum = 0;
3162 int paths = 0; 3191 int paths = 0;
3163 struct sctp_transport 3192 struct sctp_transport *peer_addr;
3164 3193
3165 list_for_each_entry(p 3194 list_for_each_entry(peer_addr, &asoc->peer.transport_addr_list,
3166 trans 3195 transports) {
3167 path_sum += p 3196 path_sum += peer_addr->pathmaxrxt;
3168 paths++; 3197 paths++;
3169 } 3198 }
3170 3199
3171 /* Only validate asoc 3200 /* Only validate asocmaxrxt if we have more than
3172 * one path/transport 3201 * one path/transport. We do this because path
3173 * retransmissions ar 3202 * retransmissions are only counted when we have more
3174 * then one path. 3203 * then one path.
3175 */ 3204 */
3176 if (paths > 1 && 3205 if (paths > 1 &&
3177 assocparams->saso !! 3206 assocparams.sasoc_asocmaxrxt > path_sum)
3178 return -EINVA 3207 return -EINVAL;
3179 3208
3180 asoc->max_retrans = a !! 3209 asoc->max_retrans = assocparams.sasoc_asocmaxrxt;
3181 } 3210 }
3182 3211
3183 if (assocparams->sasoc_cookie !! 3212 if (assocparams.sasoc_cookie_life != 0)
3184 asoc->cookie_life = !! 3213 asoc->cookie_life = ms_to_ktime(assocparams.sasoc_cookie_life);
3185 ms_to_ktime(a <<
3186 } else { 3214 } else {
3187 /* Set the values to the endp 3215 /* Set the values to the endpoint */
3188 struct sctp_sock *sp = sctp_s 3216 struct sctp_sock *sp = sctp_sk(sk);
3189 3217
3190 if (assocparams->sasoc_asocma !! 3218 if (assocparams.sasoc_asocmaxrxt != 0)
3191 sp->assocparams.sasoc 3219 sp->assocparams.sasoc_asocmaxrxt =
3192 !! 3220 assocparams.sasoc_asocmaxrxt;
3193 if (assocparams->sasoc_cookie !! 3221 if (assocparams.sasoc_cookie_life != 0)
3194 sp->assocparams.sasoc 3222 sp->assocparams.sasoc_cookie_life =
3195 !! 3223 assocparams.sasoc_cookie_life;
3196 } 3224 }
3197 return 0; 3225 return 0;
3198 } 3226 }
3199 3227
3200 /* 3228 /*
3201 * 7.1.16 Set/clear IPv4 mapped addresses (SC 3229 * 7.1.16 Set/clear IPv4 mapped addresses (SCTP_I_WANT_MAPPED_V4_ADDR)
3202 * 3230 *
3203 * This socket option is a boolean flag which 3231 * This socket option is a boolean flag which turns on or off mapped V4
3204 * addresses. If this option is turned on an 3232 * addresses. If this option is turned on and the socket is type
3205 * PF_INET6, then IPv4 addresses will be mapp 3233 * PF_INET6, then IPv4 addresses will be mapped to V6 representation.
3206 * If this option is turned off, then no mapp 3234 * If this option is turned off, then no mapping will be done of V4
3207 * addresses and a user will receive both PF_ 3235 * addresses and a user will receive both PF_INET6 and PF_INET type
3208 * addresses on the socket. 3236 * addresses on the socket.
3209 */ 3237 */
3210 static int sctp_setsockopt_mappedv4(struct so !! 3238 static int sctp_setsockopt_mappedv4(struct sock *sk, char __user *optval, unsigned int optlen)
3211 unsigned <<
3212 { 3239 {
>> 3240 int val;
3213 struct sctp_sock *sp = sctp_sk(sk); 3241 struct sctp_sock *sp = sctp_sk(sk);
3214 3242
3215 if (optlen < sizeof(int)) 3243 if (optlen < sizeof(int))
3216 return -EINVAL; 3244 return -EINVAL;
3217 if (*val) !! 3245 if (get_user(val, (int __user *)optval))
>> 3246 return -EFAULT;
>> 3247 if (val)
3218 sp->v4mapped = 1; 3248 sp->v4mapped = 1;
3219 else 3249 else
3220 sp->v4mapped = 0; 3250 sp->v4mapped = 0;
3221 3251
3222 return 0; 3252 return 0;
3223 } 3253 }
3224 3254
3225 /* 3255 /*
3226 * 8.1.16. Get or Set the Maximum Fragmentat 3256 * 8.1.16. Get or Set the Maximum Fragmentation Size (SCTP_MAXSEG)
3227 * This option will get or set the maximum si 3257 * This option will get or set the maximum size to put in any outgoing
3228 * SCTP DATA chunk. If a message is larger t 3258 * SCTP DATA chunk. If a message is larger than this size it will be
3229 * fragmented by SCTP into the specified size 3259 * fragmented by SCTP into the specified size. Note that the underlying
3230 * SCTP implementation may fragment into smal 3260 * SCTP implementation may fragment into smaller sized chunks when the
3231 * PMTU of the underlying association is smal 3261 * PMTU of the underlying association is smaller than the value set by
3232 * the user. The default value for this opti 3262 * the user. The default value for this option is '' which indicates
3233 * the user is NOT limiting fragmentation and 3263 * the user is NOT limiting fragmentation and only the PMTU will effect
3234 * SCTP's choice of DATA chunk size. Note al 3264 * SCTP's choice of DATA chunk size. Note also that values set larger
3235 * than the maximum size of an IP datagram wi 3265 * than the maximum size of an IP datagram will effectively let SCTP
3236 * control fragmentation (i.e. the same as se 3266 * control fragmentation (i.e. the same as setting this option to 0).
3237 * 3267 *
3238 * The following structure is used to access 3268 * The following structure is used to access and modify this parameter:
3239 * 3269 *
3240 * struct sctp_assoc_value { 3270 * struct sctp_assoc_value {
3241 * sctp_assoc_t assoc_id; 3271 * sctp_assoc_t assoc_id;
3242 * uint32_t assoc_value; 3272 * uint32_t assoc_value;
3243 * }; 3273 * };
3244 * 3274 *
3245 * assoc_id: This parameter is ignored for o 3275 * assoc_id: This parameter is ignored for one-to-one style sockets.
3246 * For one-to-many style sockets this para 3276 * For one-to-many style sockets this parameter indicates which
3247 * association the user is performing an a 3277 * association the user is performing an action upon. Note that if
3248 * this field's value is zero then the end 3278 * this field's value is zero then the endpoints default value is
3249 * changed (effecting future associations 3279 * changed (effecting future associations only).
3250 * assoc_value: This parameter specifies the 3280 * assoc_value: This parameter specifies the maximum size in bytes.
3251 */ 3281 */
3252 static int sctp_setsockopt_maxseg(struct sock !! 3282 static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned int optlen)
3253 struct sctp <<
3254 unsigned in <<
3255 { 3283 {
3256 struct sctp_sock *sp = sctp_sk(sk); 3284 struct sctp_sock *sp = sctp_sk(sk);
>> 3285 struct sctp_assoc_value params;
3257 struct sctp_association *asoc; 3286 struct sctp_association *asoc;
3258 sctp_assoc_t assoc_id; <<
3259 int val; 3287 int val;
3260 3288
3261 if (optlen == sizeof(int)) { 3289 if (optlen == sizeof(int)) {
3262 pr_warn_ratelimited(DEPRECATE 3290 pr_warn_ratelimited(DEPRECATED
3263 "%s (pid 3291 "%s (pid %d) "
3264 "Use of i 3292 "Use of int in maxseg socket option.\n"
3265 "Use stru 3293 "Use struct sctp_assoc_value instead\n",
3266 current-> 3294 current->comm, task_pid_nr(current));
3267 assoc_id = SCTP_FUTURE_ASSOC; !! 3295 if (copy_from_user(&val, optval, optlen))
3268 val = *(int *)params; !! 3296 return -EFAULT;
>> 3297 params.assoc_id = SCTP_FUTURE_ASSOC;
3269 } else if (optlen == sizeof(struct sc 3298 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3270 assoc_id = params->assoc_id; !! 3299 if (copy_from_user(¶ms, optval, optlen))
3271 val = params->assoc_value; !! 3300 return -EFAULT;
>> 3301 val = params.assoc_value;
3272 } else { 3302 } else {
3273 return -EINVAL; 3303 return -EINVAL;
3274 } 3304 }
3275 3305
3276 asoc = sctp_id2assoc(sk, assoc_id); !! 3306 asoc = sctp_id2assoc(sk, params.assoc_id);
3277 if (!asoc && assoc_id != SCTP_FUTURE_ !! 3307 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3278 sctp_style(sk, UDP)) 3308 sctp_style(sk, UDP))
3279 return -EINVAL; 3309 return -EINVAL;
3280 3310
3281 if (val) { 3311 if (val) {
3282 int min_len, max_len; 3312 int min_len, max_len;
3283 __u16 datasize = asoc ? sctp_ 3313 __u16 datasize = asoc ? sctp_datachk_len(&asoc->stream) :
3284 sizeof(struc 3314 sizeof(struct sctp_data_chunk);
3285 3315
3286 min_len = sctp_min_frag_point 3316 min_len = sctp_min_frag_point(sp, datasize);
3287 max_len = SCTP_MAX_CHUNK_LEN 3317 max_len = SCTP_MAX_CHUNK_LEN - datasize;
3288 3318
3289 if (val < min_len || val > ma 3319 if (val < min_len || val > max_len)
3290 return -EINVAL; 3320 return -EINVAL;
3291 } 3321 }
3292 3322
3293 if (asoc) { 3323 if (asoc) {
3294 asoc->user_frag = val; 3324 asoc->user_frag = val;
3295 sctp_assoc_update_frag_point( 3325 sctp_assoc_update_frag_point(asoc);
3296 } else { 3326 } else {
3297 sp->user_frag = val; 3327 sp->user_frag = val;
3298 } 3328 }
3299 3329
3300 return 0; 3330 return 0;
3301 } 3331 }
3302 3332
3303 3333
3304 /* 3334 /*
3305 * 7.1.9 Set Peer Primary Address (SCTP_SET_ 3335 * 7.1.9 Set Peer Primary Address (SCTP_SET_PEER_PRIMARY_ADDR)
3306 * 3336 *
3307 * Requests that the peer mark the enclosed 3337 * Requests that the peer mark the enclosed address as the association
3308 * primary. The enclosed address must be on 3338 * primary. The enclosed address must be one of the association's
3309 * locally bound addresses. The following s 3339 * locally bound addresses. The following structure is used to make a
3310 * set primary request: 3340 * set primary request:
3311 */ 3341 */
3312 static int sctp_setsockopt_peer_primary_addr( !! 3342 static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optval,
3313 <<
3314 3343 unsigned int optlen)
3315 { 3344 {
3316 struct sctp_sock *sp; 3345 struct sctp_sock *sp;
3317 struct sctp_association *asoc = NULL; 3346 struct sctp_association *asoc = NULL;
>> 3347 struct sctp_setpeerprim prim;
3318 struct sctp_chunk *chunk; 3348 struct sctp_chunk *chunk;
3319 struct sctp_af *af; 3349 struct sctp_af *af;
3320 int err; 3350 int err;
3321 3351
3322 sp = sctp_sk(sk); 3352 sp = sctp_sk(sk);
3323 3353
3324 if (!sp->ep->asconf_enable) 3354 if (!sp->ep->asconf_enable)
3325 return -EPERM; 3355 return -EPERM;
3326 3356
3327 if (optlen != sizeof(struct sctp_setp 3357 if (optlen != sizeof(struct sctp_setpeerprim))
3328 return -EINVAL; 3358 return -EINVAL;
3329 3359
3330 asoc = sctp_id2assoc(sk, prim->sspp_a !! 3360 if (copy_from_user(&prim, optval, optlen))
>> 3361 return -EFAULT;
>> 3362
>> 3363 asoc = sctp_id2assoc(sk, prim.sspp_assoc_id);
3331 if (!asoc) 3364 if (!asoc)
3332 return -EINVAL; 3365 return -EINVAL;
3333 3366
3334 if (!asoc->peer.asconf_capable) 3367 if (!asoc->peer.asconf_capable)
3335 return -EPERM; 3368 return -EPERM;
3336 3369
3337 if (asoc->peer.addip_disabled_mask & 3370 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_SET_PRIMARY)
3338 return -EPERM; 3371 return -EPERM;
3339 3372
3340 if (!sctp_state(asoc, ESTABLISHED)) 3373 if (!sctp_state(asoc, ESTABLISHED))
3341 return -ENOTCONN; 3374 return -ENOTCONN;
3342 3375
3343 af = sctp_get_af_specific(prim->sspp_ !! 3376 af = sctp_get_af_specific(prim.sspp_addr.ss_family);
3344 if (!af) 3377 if (!af)
3345 return -EINVAL; 3378 return -EINVAL;
3346 3379
3347 if (!af->addr_valid((union sctp_addr !! 3380 if (!af->addr_valid((union sctp_addr *)&prim.sspp_addr, sp, NULL))
3348 return -EADDRNOTAVAIL; 3381 return -EADDRNOTAVAIL;
3349 3382
3350 if (!sctp_assoc_lookup_laddr(asoc, (u !! 3383 if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim.sspp_addr))
3351 return -EADDRNOTAVAIL; 3384 return -EADDRNOTAVAIL;
3352 3385
3353 /* Allow security module to validate 3386 /* Allow security module to validate address. */
3354 err = security_sctp_bind_connect(sk, 3387 err = security_sctp_bind_connect(sk, SCTP_SET_PEER_PRIMARY_ADDR,
3355 (str !! 3388 (struct sockaddr *)&prim.sspp_addr,
3356 af-> 3389 af->sockaddr_len);
3357 if (err) 3390 if (err)
3358 return err; 3391 return err;
3359 3392
3360 /* Create an ASCONF chunk with SET_PR 3393 /* Create an ASCONF chunk with SET_PRIMARY parameter */
3361 chunk = sctp_make_asconf_set_prim(aso 3394 chunk = sctp_make_asconf_set_prim(asoc,
3362 (un !! 3395 (union sctp_addr *)&prim.sspp_addr);
3363 if (!chunk) 3396 if (!chunk)
3364 return -ENOMEM; 3397 return -ENOMEM;
3365 3398
3366 err = sctp_send_asconf(asoc, chunk); 3399 err = sctp_send_asconf(asoc, chunk);
3367 3400
3368 pr_debug("%s: we set peer primary add 3401 pr_debug("%s: we set peer primary addr primitively\n", __func__);
3369 3402
3370 return err; 3403 return err;
3371 } 3404 }
3372 3405
3373 static int sctp_setsockopt_adaptation_layer(s !! 3406 static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval,
3374 s <<
3375 u 3407 unsigned int optlen)
3376 { 3408 {
>> 3409 struct sctp_setadaptation adaptation;
>> 3410
3377 if (optlen != sizeof(struct sctp_seta 3411 if (optlen != sizeof(struct sctp_setadaptation))
3378 return -EINVAL; 3412 return -EINVAL;
>> 3413 if (copy_from_user(&adaptation, optval, optlen))
>> 3414 return -EFAULT;
3379 3415
3380 sctp_sk(sk)->adaptation_ind = adapt-> !! 3416 sctp_sk(sk)->adaptation_ind = adaptation.ssb_adaptation_ind;
3381 3417
3382 return 0; 3418 return 0;
3383 } 3419 }
3384 3420
3385 /* 3421 /*
3386 * 7.1.29. Set or Get the default context (S 3422 * 7.1.29. Set or Get the default context (SCTP_CONTEXT)
3387 * 3423 *
3388 * The context field in the sctp_sndrcvinfo s 3424 * The context field in the sctp_sndrcvinfo structure is normally only
3389 * used when a failed message is retrieved ho 3425 * used when a failed message is retrieved holding the value that was
3390 * sent down on the actual send call. This o 3426 * sent down on the actual send call. This option allows the setting of
3391 * a default context on an association basis 3427 * a default context on an association basis that will be received on
3392 * reading messages from the peer. This is e 3428 * reading messages from the peer. This is especially helpful in the
3393 * one-2-many model for an application to kee 3429 * one-2-many model for an application to keep some reference to an
3394 * internal state machine that is processing 3430 * internal state machine that is processing messages on the
3395 * association. Note that the setting of thi 3431 * association. Note that the setting of this value only effects
3396 * received messages from the peer and does n 3432 * received messages from the peer and does not effect the value that is
3397 * saved with outbound messages. 3433 * saved with outbound messages.
3398 */ 3434 */
3399 static int sctp_setsockopt_context(struct soc !! 3435 static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
3400 struct sct <<
3401 unsigned i 3436 unsigned int optlen)
3402 { 3437 {
3403 struct sctp_sock *sp = sctp_sk(sk); 3438 struct sctp_sock *sp = sctp_sk(sk);
>> 3439 struct sctp_assoc_value params;
3404 struct sctp_association *asoc; 3440 struct sctp_association *asoc;
3405 3441
3406 if (optlen != sizeof(struct sctp_asso 3442 if (optlen != sizeof(struct sctp_assoc_value))
3407 return -EINVAL; 3443 return -EINVAL;
>> 3444 if (copy_from_user(¶ms, optval, optlen))
>> 3445 return -EFAULT;
3408 3446
3409 asoc = sctp_id2assoc(sk, params->asso !! 3447 asoc = sctp_id2assoc(sk, params.assoc_id);
3410 if (!asoc && params->assoc_id > SCTP_ !! 3448 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
3411 sctp_style(sk, UDP)) 3449 sctp_style(sk, UDP))
3412 return -EINVAL; 3450 return -EINVAL;
3413 3451
3414 if (asoc) { 3452 if (asoc) {
3415 asoc->default_rcv_context = p !! 3453 asoc->default_rcv_context = params.assoc_value;
3416 3454
3417 return 0; 3455 return 0;
3418 } 3456 }
3419 3457
3420 if (sctp_style(sk, TCP)) 3458 if (sctp_style(sk, TCP))
3421 params->assoc_id = SCTP_FUTUR !! 3459 params.assoc_id = SCTP_FUTURE_ASSOC;
3422 3460
3423 if (params->assoc_id == SCTP_FUTURE_A !! 3461 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3424 params->assoc_id == SCTP_ALL_ASSO !! 3462 params.assoc_id == SCTP_ALL_ASSOC)
3425 sp->default_rcv_context = par !! 3463 sp->default_rcv_context = params.assoc_value;
3426 3464
3427 if (params->assoc_id == SCTP_CURRENT_ !! 3465 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
3428 params->assoc_id == SCTP_ALL_ASSO !! 3466 params.assoc_id == SCTP_ALL_ASSOC)
3429 list_for_each_entry(asoc, &sp 3467 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3430 asoc->default_rcv_con !! 3468 asoc->default_rcv_context = params.assoc_value;
3431 3469
3432 return 0; 3470 return 0;
3433 } 3471 }
3434 3472
3435 /* 3473 /*
3436 * 7.1.24. Get or set fragmented interleave 3474 * 7.1.24. Get or set fragmented interleave (SCTP_FRAGMENT_INTERLEAVE)
3437 * 3475 *
3438 * This options will at a minimum specify if 3476 * This options will at a minimum specify if the implementation is doing
3439 * fragmented interleave. Fragmented interle 3477 * fragmented interleave. Fragmented interleave, for a one to many
3440 * socket, is when subsequent calls to receiv 3478 * socket, is when subsequent calls to receive a message may return
3441 * parts of messages from different associati 3479 * parts of messages from different associations. Some implementations
3442 * may allow you to turn this value on or off 3480 * may allow you to turn this value on or off. If so, when turned off,
3443 * no fragment interleave will occur (which w 3481 * no fragment interleave will occur (which will cause a head of line
3444 * blocking amongst multiple associations sha 3482 * blocking amongst multiple associations sharing the same one to many
3445 * socket). When this option is turned on, t 3483 * socket). When this option is turned on, then each receive call may
3446 * come from a different association (thus th 3484 * come from a different association (thus the user must receive data
3447 * with the extended calls (e.g. sctp_recvmsg 3485 * with the extended calls (e.g. sctp_recvmsg) to keep track of which
3448 * association each receive belongs to. 3486 * association each receive belongs to.
3449 * 3487 *
3450 * This option takes a boolean value. A non- 3488 * This option takes a boolean value. A non-zero value indicates that
3451 * fragmented interleave is on. A value of z 3489 * fragmented interleave is on. A value of zero indicates that
3452 * fragmented interleave is off. 3490 * fragmented interleave is off.
3453 * 3491 *
3454 * Note that it is important that an implemen 3492 * Note that it is important that an implementation that allows this
3455 * option to be turned on, have it off by def 3493 * option to be turned on, have it off by default. Otherwise an unaware
3456 * application using the one to many model ma 3494 * application using the one to many model may become confused and act
3457 * incorrectly. 3495 * incorrectly.
3458 */ 3496 */
3459 static int sctp_setsockopt_fragment_interleav !! 3497 static int sctp_setsockopt_fragment_interleave(struct sock *sk,
>> 3498 char __user *optval,
3460 3499 unsigned int optlen)
3461 { 3500 {
>> 3501 int val;
>> 3502
3462 if (optlen != sizeof(int)) 3503 if (optlen != sizeof(int))
3463 return -EINVAL; 3504 return -EINVAL;
>> 3505 if (get_user(val, (int __user *)optval))
>> 3506 return -EFAULT;
3464 3507
3465 sctp_sk(sk)->frag_interleave = !!*val !! 3508 sctp_sk(sk)->frag_interleave = !!val;
3466 3509
3467 if (!sctp_sk(sk)->frag_interleave) 3510 if (!sctp_sk(sk)->frag_interleave)
3468 sctp_sk(sk)->ep->intl_enable 3511 sctp_sk(sk)->ep->intl_enable = 0;
3469 3512
3470 return 0; 3513 return 0;
3471 } 3514 }
3472 3515
3473 /* 3516 /*
3474 * 8.1.21. Set or Get the SCTP Partial Deliv 3517 * 8.1.21. Set or Get the SCTP Partial Delivery Point
3475 * (SCTP_PARTIAL_DELIVERY_POINT) 3518 * (SCTP_PARTIAL_DELIVERY_POINT)
3476 * 3519 *
3477 * This option will set or get the SCTP parti 3520 * This option will set or get the SCTP partial delivery point. This
3478 * point is the size of a message where the p 3521 * point is the size of a message where the partial delivery API will be
3479 * invoked to help free up rwnd space for the 3522 * invoked to help free up rwnd space for the peer. Setting this to a
3480 * lower value will cause partial deliveries 3523 * lower value will cause partial deliveries to happen more often. The
3481 * calls argument is an integer that sets or 3524 * calls argument is an integer that sets or gets the partial delivery
3482 * point. Note also that the call will fail 3525 * point. Note also that the call will fail if the user attempts to set
3483 * this value larger than the socket receive 3526 * this value larger than the socket receive buffer size.
3484 * 3527 *
3485 * Note that any single message having a leng 3528 * Note that any single message having a length smaller than or equal to
3486 * the SCTP partial delivery point will be de 3529 * the SCTP partial delivery point will be delivered in one single read
3487 * call as long as the user provided buffer i 3530 * call as long as the user provided buffer is large enough to hold the
3488 * message. 3531 * message.
3489 */ 3532 */
3490 static int sctp_setsockopt_partial_delivery_p !! 3533 static int sctp_setsockopt_partial_delivery_point(struct sock *sk,
>> 3534 char __user *optval,
3491 3535 unsigned int optlen)
3492 { 3536 {
>> 3537 u32 val;
>> 3538
3493 if (optlen != sizeof(u32)) 3539 if (optlen != sizeof(u32))
3494 return -EINVAL; 3540 return -EINVAL;
>> 3541 if (get_user(val, (int __user *)optval))
>> 3542 return -EFAULT;
3495 3543
3496 /* Note: We double the receive buffer 3544 /* Note: We double the receive buffer from what the user sets
3497 * it to be, also initial rwnd is bas 3545 * it to be, also initial rwnd is based on rcvbuf/2.
3498 */ 3546 */
3499 if (*val > (sk->sk_rcvbuf >> 1)) !! 3547 if (val > (sk->sk_rcvbuf >> 1))
3500 return -EINVAL; 3548 return -EINVAL;
3501 3549
3502 sctp_sk(sk)->pd_point = *val; !! 3550 sctp_sk(sk)->pd_point = val;
3503 3551
3504 return 0; /* is this the right error 3552 return 0; /* is this the right error code? */
3505 } 3553 }
3506 3554
3507 /* 3555 /*
3508 * 7.1.28. Set or Get the maximum burst (SCT 3556 * 7.1.28. Set or Get the maximum burst (SCTP_MAX_BURST)
3509 * 3557 *
3510 * This option will allow a user to change th 3558 * This option will allow a user to change the maximum burst of packets
3511 * that can be emitted by this association. 3559 * that can be emitted by this association. Note that the default value
3512 * is 4, and some implementations may restric 3560 * is 4, and some implementations may restrict this setting so that it
3513 * can only be lowered. 3561 * can only be lowered.
3514 * 3562 *
3515 * NOTE: This text doesn't seem right. Do th 3563 * NOTE: This text doesn't seem right. Do this on a socket basis with
3516 * future associations inheriting the socket 3564 * future associations inheriting the socket value.
3517 */ 3565 */
3518 static int sctp_setsockopt_maxburst(struct so 3566 static int sctp_setsockopt_maxburst(struct sock *sk,
3519 struct sc !! 3567 char __user *optval,
3520 unsigned 3568 unsigned int optlen)
3521 { 3569 {
3522 struct sctp_sock *sp = sctp_sk(sk); 3570 struct sctp_sock *sp = sctp_sk(sk);
>> 3571 struct sctp_assoc_value params;
3523 struct sctp_association *asoc; 3572 struct sctp_association *asoc;
3524 sctp_assoc_t assoc_id; <<
3525 u32 assoc_value; <<
3526 3573
3527 if (optlen == sizeof(int)) { 3574 if (optlen == sizeof(int)) {
3528 pr_warn_ratelimited(DEPRECATE 3575 pr_warn_ratelimited(DEPRECATED
3529 "%s (pid 3576 "%s (pid %d) "
3530 "Use of i 3577 "Use of int in max_burst socket option deprecated.\n"
3531 "Use stru 3578 "Use struct sctp_assoc_value instead\n",
3532 current-> 3579 current->comm, task_pid_nr(current));
3533 assoc_id = SCTP_FUTURE_ASSOC; !! 3580 if (copy_from_user(¶ms.assoc_value, optval, optlen))
3534 assoc_value = *((int *)params !! 3581 return -EFAULT;
>> 3582 params.assoc_id = SCTP_FUTURE_ASSOC;
3535 } else if (optlen == sizeof(struct sc 3583 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3536 assoc_id = params->assoc_id; !! 3584 if (copy_from_user(¶ms, optval, optlen))
3537 assoc_value = params->assoc_v !! 3585 return -EFAULT;
3538 } else 3586 } else
3539 return -EINVAL; 3587 return -EINVAL;
3540 3588
3541 asoc = sctp_id2assoc(sk, assoc_id); !! 3589 asoc = sctp_id2assoc(sk, params.assoc_id);
3542 if (!asoc && assoc_id > SCTP_ALL_ASSO !! 3590 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
>> 3591 sctp_style(sk, UDP))
3543 return -EINVAL; 3592 return -EINVAL;
3544 3593
3545 if (asoc) { 3594 if (asoc) {
3546 asoc->max_burst = assoc_value !! 3595 asoc->max_burst = params.assoc_value;
3547 3596
3548 return 0; 3597 return 0;
3549 } 3598 }
3550 3599
3551 if (sctp_style(sk, TCP)) 3600 if (sctp_style(sk, TCP))
3552 assoc_id = SCTP_FUTURE_ASSOC; !! 3601 params.assoc_id = SCTP_FUTURE_ASSOC;
3553 3602
3554 if (assoc_id == SCTP_FUTURE_ASSOC || !! 3603 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3555 sp->max_burst = assoc_value; !! 3604 params.assoc_id == SCTP_ALL_ASSOC)
>> 3605 sp->max_burst = params.assoc_value;
3556 3606
3557 if (assoc_id == SCTP_CURRENT_ASSOC || !! 3607 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
>> 3608 params.assoc_id == SCTP_ALL_ASSOC)
3558 list_for_each_entry(asoc, &sp 3609 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3559 asoc->max_burst = ass !! 3610 asoc->max_burst = params.assoc_value;
3560 3611
3561 return 0; 3612 return 0;
3562 } 3613 }
3563 3614
3564 /* 3615 /*
3565 * 7.1.18. Add a chunk that must be authenti 3616 * 7.1.18. Add a chunk that must be authenticated (SCTP_AUTH_CHUNK)
3566 * 3617 *
3567 * This set option adds a chunk type that the 3618 * This set option adds a chunk type that the user is requesting to be
3568 * received only in an authenticated way. Ch 3619 * received only in an authenticated way. Changes to the list of chunks
3569 * will only effect future associations on th 3620 * will only effect future associations on the socket.
3570 */ 3621 */
3571 static int sctp_setsockopt_auth_chunk(struct 3622 static int sctp_setsockopt_auth_chunk(struct sock *sk,
3572 struct !! 3623 char __user *optval,
3573 unsigne 3624 unsigned int optlen)
3574 { 3625 {
3575 struct sctp_endpoint *ep = sctp_sk(sk 3626 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3627 struct sctp_authchunk val;
3576 3628
3577 if (!ep->auth_enable) 3629 if (!ep->auth_enable)
3578 return -EACCES; 3630 return -EACCES;
3579 3631
3580 if (optlen != sizeof(struct sctp_auth 3632 if (optlen != sizeof(struct sctp_authchunk))
3581 return -EINVAL; 3633 return -EINVAL;
>> 3634 if (copy_from_user(&val, optval, optlen))
>> 3635 return -EFAULT;
3582 3636
3583 switch (val->sauth_chunk) { !! 3637 switch (val.sauth_chunk) {
3584 case SCTP_CID_INIT: 3638 case SCTP_CID_INIT:
3585 case SCTP_CID_INIT_ACK: 3639 case SCTP_CID_INIT_ACK:
3586 case SCTP_CID_SHUTDOWN_COMPLETE: 3640 case SCTP_CID_SHUTDOWN_COMPLETE:
3587 case SCTP_CID_AUTH: 3641 case SCTP_CID_AUTH:
3588 return -EINVAL; 3642 return -EINVAL;
3589 } 3643 }
3590 3644
3591 /* add this chunk id to the endpoint 3645 /* add this chunk id to the endpoint */
3592 return sctp_auth_ep_add_chunkid(ep, v !! 3646 return sctp_auth_ep_add_chunkid(ep, val.sauth_chunk);
3593 } 3647 }
3594 3648
3595 /* 3649 /*
3596 * 7.1.19. Get or set the list of supported 3650 * 7.1.19. Get or set the list of supported HMAC Identifiers (SCTP_HMAC_IDENT)
3597 * 3651 *
3598 * This option gets or sets the list of HMAC 3652 * This option gets or sets the list of HMAC algorithms that the local
3599 * endpoint requires the peer to use. 3653 * endpoint requires the peer to use.
3600 */ 3654 */
3601 static int sctp_setsockopt_hmac_ident(struct 3655 static int sctp_setsockopt_hmac_ident(struct sock *sk,
3602 struct !! 3656 char __user *optval,
3603 unsigne 3657 unsigned int optlen)
3604 { 3658 {
3605 struct sctp_endpoint *ep = sctp_sk(sk 3659 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3660 struct sctp_hmacalgo *hmacs;
3606 u32 idents; 3661 u32 idents;
>> 3662 int err;
3607 3663
3608 if (!ep->auth_enable) 3664 if (!ep->auth_enable)
3609 return -EACCES; 3665 return -EACCES;
3610 3666
3611 if (optlen < sizeof(struct sctp_hmaca 3667 if (optlen < sizeof(struct sctp_hmacalgo))
3612 return -EINVAL; 3668 return -EINVAL;
3613 optlen = min_t(unsigned int, optlen, 3669 optlen = min_t(unsigned int, optlen, sizeof(struct sctp_hmacalgo) +
3614 3670 SCTP_AUTH_NUM_HMACS * sizeof(u16));
3615 3671
>> 3672 hmacs = memdup_user(optval, optlen);
>> 3673 if (IS_ERR(hmacs))
>> 3674 return PTR_ERR(hmacs);
>> 3675
3616 idents = hmacs->shmac_num_idents; 3676 idents = hmacs->shmac_num_idents;
3617 if (idents == 0 || idents > SCTP_AUTH 3677 if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
3618 (idents * sizeof(u16)) > (optlen !! 3678 (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) {
3619 return -EINVAL; !! 3679 err = -EINVAL;
>> 3680 goto out;
>> 3681 }
3620 3682
3621 return sctp_auth_ep_set_hmacs(ep, hma !! 3683 err = sctp_auth_ep_set_hmacs(ep, hmacs);
>> 3684 out:
>> 3685 kfree(hmacs);
>> 3686 return err;
3622 } 3687 }
3623 3688
3624 /* 3689 /*
3625 * 7.1.20. Set a shared key (SCTP_AUTH_KEY) 3690 * 7.1.20. Set a shared key (SCTP_AUTH_KEY)
3626 * 3691 *
3627 * This option will set a shared secret key w 3692 * This option will set a shared secret key which is used to build an
3628 * association shared key. 3693 * association shared key.
3629 */ 3694 */
3630 static int sctp_setsockopt_auth_key(struct so 3695 static int sctp_setsockopt_auth_key(struct sock *sk,
3631 struct sc !! 3696 char __user *optval,
3632 unsigned 3697 unsigned int optlen)
3633 { 3698 {
3634 struct sctp_endpoint *ep = sctp_sk(sk 3699 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3700 struct sctp_authkey *authkey;
3635 struct sctp_association *asoc; 3701 struct sctp_association *asoc;
3636 int ret = -EINVAL; 3702 int ret = -EINVAL;
3637 3703
3638 if (optlen <= sizeof(struct sctp_auth 3704 if (optlen <= sizeof(struct sctp_authkey))
3639 return -EINVAL; 3705 return -EINVAL;
3640 /* authkey->sca_keylength is u16, so 3706 /* authkey->sca_keylength is u16, so optlen can't be bigger than
3641 * this. 3707 * this.
3642 */ 3708 */
3643 optlen = min_t(unsigned int, optlen, 3709 optlen = min_t(unsigned int, optlen, USHRT_MAX + sizeof(*authkey));
3644 3710
>> 3711 authkey = memdup_user(optval, optlen);
>> 3712 if (IS_ERR(authkey))
>> 3713 return PTR_ERR(authkey);
>> 3714
3645 if (authkey->sca_keylength > optlen - 3715 if (authkey->sca_keylength > optlen - sizeof(*authkey))
3646 goto out; 3716 goto out;
3647 3717
3648 asoc = sctp_id2assoc(sk, authkey->sca 3718 asoc = sctp_id2assoc(sk, authkey->sca_assoc_id);
3649 if (!asoc && authkey->sca_assoc_id > 3719 if (!asoc && authkey->sca_assoc_id > SCTP_ALL_ASSOC &&
3650 sctp_style(sk, UDP)) 3720 sctp_style(sk, UDP))
3651 goto out; 3721 goto out;
3652 3722
3653 if (asoc) { 3723 if (asoc) {
3654 ret = sctp_auth_set_key(ep, a 3724 ret = sctp_auth_set_key(ep, asoc, authkey);
3655 goto out; 3725 goto out;
3656 } 3726 }
3657 3727
3658 if (sctp_style(sk, TCP)) 3728 if (sctp_style(sk, TCP))
3659 authkey->sca_assoc_id = SCTP_ 3729 authkey->sca_assoc_id = SCTP_FUTURE_ASSOC;
3660 3730
3661 if (authkey->sca_assoc_id == SCTP_FUT 3731 if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC ||
3662 authkey->sca_assoc_id == SCTP_ALL 3732 authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
3663 ret = sctp_auth_set_key(ep, a 3733 ret = sctp_auth_set_key(ep, asoc, authkey);
3664 if (ret) 3734 if (ret)
3665 goto out; 3735 goto out;
3666 } 3736 }
3667 3737
3668 ret = 0; 3738 ret = 0;
3669 3739
3670 if (authkey->sca_assoc_id == SCTP_CUR 3740 if (authkey->sca_assoc_id == SCTP_CURRENT_ASSOC ||
3671 authkey->sca_assoc_id == SCTP_ALL 3741 authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
3672 list_for_each_entry(asoc, &ep 3742 list_for_each_entry(asoc, &ep->asocs, asocs) {
3673 int res = sctp_auth_s 3743 int res = sctp_auth_set_key(ep, asoc, authkey);
3674 3744
3675 if (res && !ret) 3745 if (res && !ret)
3676 ret = res; 3746 ret = res;
3677 } 3747 }
3678 } 3748 }
3679 3749
3680 out: 3750 out:
3681 memzero_explicit(authkey, optlen); !! 3751 kzfree(authkey);
3682 return ret; 3752 return ret;
3683 } 3753 }
3684 3754
3685 /* 3755 /*
3686 * 7.1.21. Get or set the active shared key 3756 * 7.1.21. Get or set the active shared key (SCTP_AUTH_ACTIVE_KEY)
3687 * 3757 *
3688 * This option will get or set the active sha 3758 * This option will get or set the active shared key to be used to build
3689 * the association shared key. 3759 * the association shared key.
3690 */ 3760 */
3691 static int sctp_setsockopt_active_key(struct 3761 static int sctp_setsockopt_active_key(struct sock *sk,
3692 struct !! 3762 char __user *optval,
3693 unsigne 3763 unsigned int optlen)
3694 { 3764 {
3695 struct sctp_endpoint *ep = sctp_sk(sk 3765 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3696 struct sctp_association *asoc; 3766 struct sctp_association *asoc;
>> 3767 struct sctp_authkeyid val;
3697 int ret = 0; 3768 int ret = 0;
3698 3769
3699 if (optlen != sizeof(struct sctp_auth 3770 if (optlen != sizeof(struct sctp_authkeyid))
3700 return -EINVAL; 3771 return -EINVAL;
>> 3772 if (copy_from_user(&val, optval, optlen))
>> 3773 return -EFAULT;
3701 3774
3702 asoc = sctp_id2assoc(sk, val->scact_a !! 3775 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3703 if (!asoc && val->scact_assoc_id > SC !! 3776 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3704 sctp_style(sk, UDP)) 3777 sctp_style(sk, UDP))
3705 return -EINVAL; 3778 return -EINVAL;
3706 3779
3707 if (asoc) 3780 if (asoc)
3708 return sctp_auth_set_active_k !! 3781 return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3709 3782
3710 if (sctp_style(sk, TCP)) 3783 if (sctp_style(sk, TCP))
3711 val->scact_assoc_id = SCTP_FU !! 3784 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3712 3785
3713 if (val->scact_assoc_id == SCTP_FUTUR !! 3786 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3714 val->scact_assoc_id == SCTP_ALL_A !! 3787 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3715 ret = sctp_auth_set_active_ke !! 3788 ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3716 if (ret) 3789 if (ret)
3717 return ret; 3790 return ret;
3718 } 3791 }
3719 3792
3720 if (val->scact_assoc_id == SCTP_CURRE !! 3793 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3721 val->scact_assoc_id == SCTP_ALL_A !! 3794 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3722 list_for_each_entry(asoc, &ep 3795 list_for_each_entry(asoc, &ep->asocs, asocs) {
3723 int res = sctp_auth_s 3796 int res = sctp_auth_set_active_key(ep, asoc,
3724 !! 3797 val.scact_keynumber);
3725 3798
3726 if (res && !ret) 3799 if (res && !ret)
3727 ret = res; 3800 ret = res;
3728 } 3801 }
3729 } 3802 }
3730 3803
3731 return ret; 3804 return ret;
3732 } 3805 }
3733 3806
3734 /* 3807 /*
3735 * 7.1.22. Delete a shared key (SCTP_AUTH_DE 3808 * 7.1.22. Delete a shared key (SCTP_AUTH_DELETE_KEY)
3736 * 3809 *
3737 * This set option will delete a shared secre 3810 * This set option will delete a shared secret key from use.
3738 */ 3811 */
3739 static int sctp_setsockopt_del_key(struct soc 3812 static int sctp_setsockopt_del_key(struct sock *sk,
3740 struct sct !! 3813 char __user *optval,
3741 unsigned i 3814 unsigned int optlen)
3742 { 3815 {
3743 struct sctp_endpoint *ep = sctp_sk(sk 3816 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3744 struct sctp_association *asoc; 3817 struct sctp_association *asoc;
>> 3818 struct sctp_authkeyid val;
3745 int ret = 0; 3819 int ret = 0;
3746 3820
3747 if (optlen != sizeof(struct sctp_auth 3821 if (optlen != sizeof(struct sctp_authkeyid))
3748 return -EINVAL; 3822 return -EINVAL;
>> 3823 if (copy_from_user(&val, optval, optlen))
>> 3824 return -EFAULT;
3749 3825
3750 asoc = sctp_id2assoc(sk, val->scact_a !! 3826 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3751 if (!asoc && val->scact_assoc_id > SC !! 3827 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3752 sctp_style(sk, UDP)) 3828 sctp_style(sk, UDP))
3753 return -EINVAL; 3829 return -EINVAL;
3754 3830
3755 if (asoc) 3831 if (asoc)
3756 return sctp_auth_del_key_id(e !! 3832 return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3757 3833
3758 if (sctp_style(sk, TCP)) 3834 if (sctp_style(sk, TCP))
3759 val->scact_assoc_id = SCTP_FU !! 3835 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3760 3836
3761 if (val->scact_assoc_id == SCTP_FUTUR !! 3837 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3762 val->scact_assoc_id == SCTP_ALL_A !! 3838 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3763 ret = sctp_auth_del_key_id(ep !! 3839 ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3764 if (ret) 3840 if (ret)
3765 return ret; 3841 return ret;
3766 } 3842 }
3767 3843
3768 if (val->scact_assoc_id == SCTP_CURRE !! 3844 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3769 val->scact_assoc_id == SCTP_ALL_A !! 3845 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3770 list_for_each_entry(asoc, &ep 3846 list_for_each_entry(asoc, &ep->asocs, asocs) {
3771 int res = sctp_auth_d 3847 int res = sctp_auth_del_key_id(ep, asoc,
3772 !! 3848 val.scact_keynumber);
3773 3849
3774 if (res && !ret) 3850 if (res && !ret)
3775 ret = res; 3851 ret = res;
3776 } 3852 }
3777 } 3853 }
3778 3854
3779 return ret; 3855 return ret;
3780 } 3856 }
3781 3857
3782 /* 3858 /*
3783 * 8.3.4 Deactivate a Shared Key (SCTP_AUTH_ 3859 * 8.3.4 Deactivate a Shared Key (SCTP_AUTH_DEACTIVATE_KEY)
3784 * 3860 *
3785 * This set option will deactivate a shared s 3861 * This set option will deactivate a shared secret key.
3786 */ 3862 */
3787 static int sctp_setsockopt_deactivate_key(str !! 3863 static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval,
3788 str <<
3789 uns 3864 unsigned int optlen)
3790 { 3865 {
3791 struct sctp_endpoint *ep = sctp_sk(sk 3866 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3792 struct sctp_association *asoc; 3867 struct sctp_association *asoc;
>> 3868 struct sctp_authkeyid val;
3793 int ret = 0; 3869 int ret = 0;
3794 3870
3795 if (optlen != sizeof(struct sctp_auth 3871 if (optlen != sizeof(struct sctp_authkeyid))
3796 return -EINVAL; 3872 return -EINVAL;
>> 3873 if (copy_from_user(&val, optval, optlen))
>> 3874 return -EFAULT;
3797 3875
3798 asoc = sctp_id2assoc(sk, val->scact_a !! 3876 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3799 if (!asoc && val->scact_assoc_id > SC !! 3877 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3800 sctp_style(sk, UDP)) 3878 sctp_style(sk, UDP))
3801 return -EINVAL; 3879 return -EINVAL;
3802 3880
3803 if (asoc) 3881 if (asoc)
3804 return sctp_auth_deact_key_id !! 3882 return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3805 3883
3806 if (sctp_style(sk, TCP)) 3884 if (sctp_style(sk, TCP))
3807 val->scact_assoc_id = SCTP_FU !! 3885 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3808 3886
3809 if (val->scact_assoc_id == SCTP_FUTUR !! 3887 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3810 val->scact_assoc_id == SCTP_ALL_A !! 3888 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3811 ret = sctp_auth_deact_key_id( !! 3889 ret = sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3812 if (ret) 3890 if (ret)
3813 return ret; 3891 return ret;
3814 } 3892 }
3815 3893
3816 if (val->scact_assoc_id == SCTP_CURRE !! 3894 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3817 val->scact_assoc_id == SCTP_ALL_A !! 3895 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3818 list_for_each_entry(asoc, &ep 3896 list_for_each_entry(asoc, &ep->asocs, asocs) {
3819 int res = sctp_auth_d 3897 int res = sctp_auth_deact_key_id(ep, asoc,
3820 !! 3898 val.scact_keynumber);
3821 3899
3822 if (res && !ret) 3900 if (res && !ret)
3823 ret = res; 3901 ret = res;
3824 } 3902 }
3825 } 3903 }
3826 3904
3827 return ret; 3905 return ret;
3828 } 3906 }
3829 3907
3830 /* 3908 /*
3831 * 8.1.23 SCTP_AUTO_ASCONF 3909 * 8.1.23 SCTP_AUTO_ASCONF
3832 * 3910 *
3833 * This option will enable or disable the use 3911 * This option will enable or disable the use of the automatic generation of
3834 * ASCONF chunks to add and delete addresses 3912 * ASCONF chunks to add and delete addresses to an existing association. Note
3835 * that this option has two caveats namely: a 3913 * that this option has two caveats namely: a) it only affects sockets that
3836 * are bound to all addresses available to th 3914 * are bound to all addresses available to the SCTP stack, and b) the system
3837 * administrator may have an overriding contr 3915 * administrator may have an overriding control that turns the ASCONF feature
3838 * off no matter what setting the socket opti 3916 * off no matter what setting the socket option may have.
3839 * This option expects an integer boolean fla 3917 * This option expects an integer boolean flag, where a non-zero value turns on
3840 * the option, and a zero value turns off the 3918 * the option, and a zero value turns off the option.
3841 * Note. In this implementation, socket opera 3919 * Note. In this implementation, socket operation overrides default parameter
3842 * being set by sysctl as well as FreeBSD imp 3920 * being set by sysctl as well as FreeBSD implementation
3843 */ 3921 */
3844 static int sctp_setsockopt_auto_asconf(struct !! 3922 static int sctp_setsockopt_auto_asconf(struct sock *sk, char __user *optval,
3845 unsig 3923 unsigned int optlen)
3846 { 3924 {
>> 3925 int val;
3847 struct sctp_sock *sp = sctp_sk(sk); 3926 struct sctp_sock *sp = sctp_sk(sk);
3848 3927
3849 if (optlen < sizeof(int)) 3928 if (optlen < sizeof(int))
3850 return -EINVAL; 3929 return -EINVAL;
3851 if (!sctp_is_ep_boundall(sk) && *val) !! 3930 if (get_user(val, (int __user *)optval))
>> 3931 return -EFAULT;
>> 3932 if (!sctp_is_ep_boundall(sk) && val)
3852 return -EINVAL; 3933 return -EINVAL;
3853 if ((*val && sp->do_auto_asconf) || ( !! 3934 if ((val && sp->do_auto_asconf) || (!val && !sp->do_auto_asconf))
3854 return 0; 3935 return 0;
3855 3936
3856 spin_lock_bh(&sock_net(sk)->sctp.addr 3937 spin_lock_bh(&sock_net(sk)->sctp.addr_wq_lock);
3857 if (*val == 0 && sp->do_auto_asconf) !! 3938 if (val == 0 && sp->do_auto_asconf) {
3858 list_del(&sp->auto_asconf_lis 3939 list_del(&sp->auto_asconf_list);
3859 sp->do_auto_asconf = 0; 3940 sp->do_auto_asconf = 0;
3860 } else if (*val && !sp->do_auto_ascon !! 3941 } else if (val && !sp->do_auto_asconf) {
3861 list_add_tail(&sp->auto_ascon 3942 list_add_tail(&sp->auto_asconf_list,
3862 &sock_net(sk)->sctp.auto_ 3943 &sock_net(sk)->sctp.auto_asconf_splist);
3863 sp->do_auto_asconf = 1; 3944 sp->do_auto_asconf = 1;
3864 } 3945 }
3865 spin_unlock_bh(&sock_net(sk)->sctp.ad 3946 spin_unlock_bh(&sock_net(sk)->sctp.addr_wq_lock);
3866 return 0; 3947 return 0;
3867 } 3948 }
3868 3949
3869 /* 3950 /*
3870 * SCTP_PEER_ADDR_THLDS 3951 * SCTP_PEER_ADDR_THLDS
3871 * 3952 *
3872 * This option allows us to alter the partial 3953 * This option allows us to alter the partially failed threshold for one or all
3873 * transports in an association. See Section 3954 * transports in an association. See Section 6.1 of:
3874 * http://www.ietf.org/id/draft-nishida-tsvwg 3955 * http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
3875 */ 3956 */
3876 static int sctp_setsockopt_paddr_thresholds(s 3957 static int sctp_setsockopt_paddr_thresholds(struct sock *sk,
3877 s !! 3958 char __user *optval,
3878 u 3959 unsigned int optlen, bool v2)
3879 { 3960 {
>> 3961 struct sctp_paddrthlds_v2 val;
3880 struct sctp_transport *trans; 3962 struct sctp_transport *trans;
3881 struct sctp_association *asoc; 3963 struct sctp_association *asoc;
3882 int len; 3964 int len;
3883 3965
3884 len = v2 ? sizeof(*val) : sizeof(stru !! 3966 len = v2 ? sizeof(val) : sizeof(struct sctp_paddrthlds);
3885 if (optlen < len) 3967 if (optlen < len)
3886 return -EINVAL; 3968 return -EINVAL;
>> 3969 if (copy_from_user(&val, optval, len))
>> 3970 return -EFAULT;
3887 3971
3888 if (v2 && val->spt_pathpfthld > val-> !! 3972 if (v2 && val.spt_pathpfthld > val.spt_pathcpthld)
3889 return -EINVAL; 3973 return -EINVAL;
3890 3974
3891 if (!sctp_is_any(sk, (const union sct !! 3975 if (!sctp_is_any(sk, (const union sctp_addr *)&val.spt_address)) {
3892 trans = sctp_addr_id2transpor !! 3976 trans = sctp_addr_id2transport(sk, &val.spt_address,
3893 !! 3977 val.spt_assoc_id);
3894 if (!trans) 3978 if (!trans)
3895 return -ENOENT; 3979 return -ENOENT;
3896 3980
3897 if (val->spt_pathmaxrxt) !! 3981 if (val.spt_pathmaxrxt)
3898 trans->pathmaxrxt = v !! 3982 trans->pathmaxrxt = val.spt_pathmaxrxt;
3899 if (v2) 3983 if (v2)
3900 trans->ps_retrans = v !! 3984 trans->ps_retrans = val.spt_pathcpthld;
3901 trans->pf_retrans = val->spt_ !! 3985 trans->pf_retrans = val.spt_pathpfthld;
3902 3986
3903 return 0; 3987 return 0;
3904 } 3988 }
3905 3989
3906 asoc = sctp_id2assoc(sk, val->spt_ass !! 3990 asoc = sctp_id2assoc(sk, val.spt_assoc_id);
3907 if (!asoc && val->spt_assoc_id != SCT !! 3991 if (!asoc && val.spt_assoc_id != SCTP_FUTURE_ASSOC &&
3908 sctp_style(sk, UDP)) 3992 sctp_style(sk, UDP))
3909 return -EINVAL; 3993 return -EINVAL;
3910 3994
3911 if (asoc) { 3995 if (asoc) {
3912 list_for_each_entry(trans, &a 3996 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
3913 transport 3997 transports) {
3914 if (val->spt_pathmaxr !! 3998 if (val.spt_pathmaxrxt)
3915 trans->pathma !! 3999 trans->pathmaxrxt = val.spt_pathmaxrxt;
3916 if (v2) 4000 if (v2)
3917 trans->ps_ret !! 4001 trans->ps_retrans = val.spt_pathcpthld;
3918 trans->pf_retrans = v !! 4002 trans->pf_retrans = val.spt_pathpfthld;
3919 } 4003 }
3920 4004
3921 if (val->spt_pathmaxrxt) !! 4005 if (val.spt_pathmaxrxt)
3922 asoc->pathmaxrxt = va !! 4006 asoc->pathmaxrxt = val.spt_pathmaxrxt;
3923 if (v2) 4007 if (v2)
3924 asoc->ps_retrans = va !! 4008 asoc->ps_retrans = val.spt_pathcpthld;
3925 asoc->pf_retrans = val->spt_p !! 4009 asoc->pf_retrans = val.spt_pathpfthld;
3926 } else { 4010 } else {
3927 struct sctp_sock *sp = sctp_s 4011 struct sctp_sock *sp = sctp_sk(sk);
3928 4012
3929 if (val->spt_pathmaxrxt) !! 4013 if (val.spt_pathmaxrxt)
3930 sp->pathmaxrxt = val- !! 4014 sp->pathmaxrxt = val.spt_pathmaxrxt;
3931 if (v2) 4015 if (v2)
3932 sp->ps_retrans = val- !! 4016 sp->ps_retrans = val.spt_pathcpthld;
3933 sp->pf_retrans = val->spt_pat !! 4017 sp->pf_retrans = val.spt_pathpfthld;
3934 } 4018 }
3935 4019
3936 return 0; 4020 return 0;
3937 } 4021 }
3938 4022
3939 static int sctp_setsockopt_recvrcvinfo(struct !! 4023 static int sctp_setsockopt_recvrcvinfo(struct sock *sk,
>> 4024 char __user *optval,
3940 unsign 4025 unsigned int optlen)
3941 { 4026 {
>> 4027 int val;
>> 4028
3942 if (optlen < sizeof(int)) 4029 if (optlen < sizeof(int))
3943 return -EINVAL; 4030 return -EINVAL;
>> 4031 if (get_user(val, (int __user *) optval))
>> 4032 return -EFAULT;
3944 4033
3945 sctp_sk(sk)->recvrcvinfo = (*val == 0 !! 4034 sctp_sk(sk)->recvrcvinfo = (val == 0) ? 0 : 1;
3946 4035
3947 return 0; 4036 return 0;
3948 } 4037 }
3949 4038
3950 static int sctp_setsockopt_recvnxtinfo(struct !! 4039 static int sctp_setsockopt_recvnxtinfo(struct sock *sk,
>> 4040 char __user *optval,
3951 unsign 4041 unsigned int optlen)
3952 { 4042 {
>> 4043 int val;
>> 4044
3953 if (optlen < sizeof(int)) 4045 if (optlen < sizeof(int))
3954 return -EINVAL; 4046 return -EINVAL;
>> 4047 if (get_user(val, (int __user *) optval))
>> 4048 return -EFAULT;
3955 4049
3956 sctp_sk(sk)->recvnxtinfo = (*val == 0 !! 4050 sctp_sk(sk)->recvnxtinfo = (val == 0) ? 0 : 1;
3957 4051
3958 return 0; 4052 return 0;
3959 } 4053 }
3960 4054
3961 static int sctp_setsockopt_pr_supported(struc 4055 static int sctp_setsockopt_pr_supported(struct sock *sk,
3962 struc !! 4056 char __user *optval,
3963 unsig 4057 unsigned int optlen)
3964 { 4058 {
>> 4059 struct sctp_assoc_value params;
3965 struct sctp_association *asoc; 4060 struct sctp_association *asoc;
3966 4061
3967 if (optlen != sizeof(*params)) !! 4062 if (optlen != sizeof(params))
3968 return -EINVAL; 4063 return -EINVAL;
3969 4064
3970 asoc = sctp_id2assoc(sk, params->asso !! 4065 if (copy_from_user(¶ms, optval, optlen))
3971 if (!asoc && params->assoc_id != SCTP !! 4066 return -EFAULT;
>> 4067
>> 4068 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4069 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3972 sctp_style(sk, UDP)) 4070 sctp_style(sk, UDP))
3973 return -EINVAL; 4071 return -EINVAL;
3974 4072
3975 sctp_sk(sk)->ep->prsctp_enable = !!pa !! 4073 sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value;
3976 4074
3977 return 0; 4075 return 0;
3978 } 4076 }
3979 4077
3980 static int sctp_setsockopt_default_prinfo(str 4078 static int sctp_setsockopt_default_prinfo(struct sock *sk,
3981 str !! 4079 char __user *optval,
3982 uns 4080 unsigned int optlen)
3983 { 4081 {
3984 struct sctp_sock *sp = sctp_sk(sk); 4082 struct sctp_sock *sp = sctp_sk(sk);
>> 4083 struct sctp_default_prinfo info;
3985 struct sctp_association *asoc; 4084 struct sctp_association *asoc;
3986 int retval = -EINVAL; 4085 int retval = -EINVAL;
3987 4086
3988 if (optlen != sizeof(*info)) !! 4087 if (optlen != sizeof(info))
3989 goto out; 4088 goto out;
3990 4089
3991 if (info->pr_policy & ~SCTP_PR_SCTP_M !! 4090 if (copy_from_user(&info, optval, sizeof(info))) {
>> 4091 retval = -EFAULT;
3992 goto out; 4092 goto out;
>> 4093 }
3993 4094
3994 if (info->pr_policy == SCTP_PR_SCTP_N !! 4095 if (info.pr_policy & ~SCTP_PR_SCTP_MASK)
3995 info->pr_value = 0; !! 4096 goto out;
3996 4097
3997 asoc = sctp_id2assoc(sk, info->pr_ass !! 4098 if (info.pr_policy == SCTP_PR_SCTP_NONE)
3998 if (!asoc && info->pr_assoc_id > SCTP !! 4099 info.pr_value = 0;
>> 4100
>> 4101 asoc = sctp_id2assoc(sk, info.pr_assoc_id);
>> 4102 if (!asoc && info.pr_assoc_id > SCTP_ALL_ASSOC &&
3999 sctp_style(sk, UDP)) 4103 sctp_style(sk, UDP))
4000 goto out; 4104 goto out;
4001 4105
4002 retval = 0; 4106 retval = 0;
4003 4107
4004 if (asoc) { 4108 if (asoc) {
4005 SCTP_PR_SET_POLICY(asoc->defa !! 4109 SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4006 asoc->default_timetolive = in !! 4110 asoc->default_timetolive = info.pr_value;
4007 goto out; 4111 goto out;
4008 } 4112 }
4009 4113
4010 if (sctp_style(sk, TCP)) 4114 if (sctp_style(sk, TCP))
4011 info->pr_assoc_id = SCTP_FUTU !! 4115 info.pr_assoc_id = SCTP_FUTURE_ASSOC;
4012 4116
4013 if (info->pr_assoc_id == SCTP_FUTURE_ !! 4117 if (info.pr_assoc_id == SCTP_FUTURE_ASSOC ||
4014 info->pr_assoc_id == SCTP_ALL_ASS !! 4118 info.pr_assoc_id == SCTP_ALL_ASSOC) {
4015 SCTP_PR_SET_POLICY(sp->defaul !! 4119 SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy);
4016 sp->default_timetolive = info !! 4120 sp->default_timetolive = info.pr_value;
4017 } 4121 }
4018 4122
4019 if (info->pr_assoc_id == SCTP_CURRENT !! 4123 if (info.pr_assoc_id == SCTP_CURRENT_ASSOC ||
4020 info->pr_assoc_id == SCTP_ALL_ASS !! 4124 info.pr_assoc_id == SCTP_ALL_ASSOC) {
4021 list_for_each_entry(asoc, &sp 4125 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4022 SCTP_PR_SET_POLICY(as !! 4126 SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4023 in !! 4127 asoc->default_timetolive = info.pr_value;
4024 asoc->default_timetol <<
4025 } 4128 }
4026 } 4129 }
4027 4130
4028 out: 4131 out:
4029 return retval; 4132 return retval;
4030 } 4133 }
4031 4134
4032 static int sctp_setsockopt_reconfig_supported 4135 static int sctp_setsockopt_reconfig_supported(struct sock *sk,
4033 !! 4136 char __user *optval,
4034 4137 unsigned int optlen)
4035 { 4138 {
>> 4139 struct sctp_assoc_value params;
4036 struct sctp_association *asoc; 4140 struct sctp_association *asoc;
4037 int retval = -EINVAL; 4141 int retval = -EINVAL;
4038 4142
4039 if (optlen != sizeof(*params)) !! 4143 if (optlen != sizeof(params))
>> 4144 goto out;
>> 4145
>> 4146 if (copy_from_user(¶ms, optval, optlen)) {
>> 4147 retval = -EFAULT;
4040 goto out; 4148 goto out;
>> 4149 }
4041 4150
4042 asoc = sctp_id2assoc(sk, params->asso !! 4151 asoc = sctp_id2assoc(sk, params.assoc_id);
4043 if (!asoc && params->assoc_id != SCTP !! 4152 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4044 sctp_style(sk, UDP)) 4153 sctp_style(sk, UDP))
4045 goto out; 4154 goto out;
4046 4155
4047 sctp_sk(sk)->ep->reconf_enable = !!pa !! 4156 sctp_sk(sk)->ep->reconf_enable = !!params.assoc_value;
4048 4157
4049 retval = 0; 4158 retval = 0;
4050 4159
4051 out: 4160 out:
4052 return retval; 4161 return retval;
4053 } 4162 }
4054 4163
4055 static int sctp_setsockopt_enable_strreset(st 4164 static int sctp_setsockopt_enable_strreset(struct sock *sk,
4056 st !! 4165 char __user *optval,
4057 un 4166 unsigned int optlen)
4058 { 4167 {
4059 struct sctp_endpoint *ep = sctp_sk(sk 4168 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 4169 struct sctp_assoc_value params;
4060 struct sctp_association *asoc; 4170 struct sctp_association *asoc;
4061 int retval = -EINVAL; 4171 int retval = -EINVAL;
4062 4172
4063 if (optlen != sizeof(*params)) !! 4173 if (optlen != sizeof(params))
4064 goto out; 4174 goto out;
4065 4175
4066 if (params->assoc_value & (~SCTP_ENAB !! 4176 if (copy_from_user(¶ms, optval, optlen)) {
>> 4177 retval = -EFAULT;
4067 goto out; 4178 goto out;
>> 4179 }
4068 4180
4069 asoc = sctp_id2assoc(sk, params->asso !! 4181 if (params.assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
4070 if (!asoc && params->assoc_id > SCTP_ !! 4182 goto out;
>> 4183
>> 4184 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4185 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4071 sctp_style(sk, UDP)) 4186 sctp_style(sk, UDP))
4072 goto out; 4187 goto out;
4073 4188
4074 retval = 0; 4189 retval = 0;
4075 4190
4076 if (asoc) { 4191 if (asoc) {
4077 asoc->strreset_enable = param !! 4192 asoc->strreset_enable = params.assoc_value;
4078 goto out; 4193 goto out;
4079 } 4194 }
4080 4195
4081 if (sctp_style(sk, TCP)) 4196 if (sctp_style(sk, TCP))
4082 params->assoc_id = SCTP_FUTUR !! 4197 params.assoc_id = SCTP_FUTURE_ASSOC;
4083 4198
4084 if (params->assoc_id == SCTP_FUTURE_A !! 4199 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4085 params->assoc_id == SCTP_ALL_ASSO !! 4200 params.assoc_id == SCTP_ALL_ASSOC)
4086 ep->strreset_enable = params- !! 4201 ep->strreset_enable = params.assoc_value;
4087 4202
4088 if (params->assoc_id == SCTP_CURRENT_ !! 4203 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4089 params->assoc_id == SCTP_ALL_ASSO !! 4204 params.assoc_id == SCTP_ALL_ASSOC)
4090 list_for_each_entry(asoc, &ep 4205 list_for_each_entry(asoc, &ep->asocs, asocs)
4091 asoc->strreset_enable !! 4206 asoc->strreset_enable = params.assoc_value;
4092 4207
4093 out: 4208 out:
4094 return retval; 4209 return retval;
4095 } 4210 }
4096 4211
4097 static int sctp_setsockopt_reset_streams(stru 4212 static int sctp_setsockopt_reset_streams(struct sock *sk,
4098 stru !! 4213 char __user *optval,
4099 unsi 4214 unsigned int optlen)
4100 { 4215 {
>> 4216 struct sctp_reset_streams *params;
4101 struct sctp_association *asoc; 4217 struct sctp_association *asoc;
>> 4218 int retval = -EINVAL;
4102 4219
4103 if (optlen < sizeof(*params)) 4220 if (optlen < sizeof(*params))
4104 return -EINVAL; 4221 return -EINVAL;
4105 /* srs_number_streams is u16, so optl 4222 /* srs_number_streams is u16, so optlen can't be bigger than this. */
4106 optlen = min_t(unsigned int, optlen, 4223 optlen = min_t(unsigned int, optlen, USHRT_MAX +
4107 4224 sizeof(__u16) * sizeof(*params));
4108 4225
>> 4226 params = memdup_user(optval, optlen);
>> 4227 if (IS_ERR(params))
>> 4228 return PTR_ERR(params);
>> 4229
4109 if (params->srs_number_streams * size 4230 if (params->srs_number_streams * sizeof(__u16) >
4110 optlen - sizeof(*params)) 4231 optlen - sizeof(*params))
4111 return -EINVAL; !! 4232 goto out;
4112 4233
4113 asoc = sctp_id2assoc(sk, params->srs_ 4234 asoc = sctp_id2assoc(sk, params->srs_assoc_id);
4114 if (!asoc) 4235 if (!asoc)
4115 return -EINVAL; !! 4236 goto out;
>> 4237
>> 4238 retval = sctp_send_reset_streams(asoc, params);
4116 4239
4117 return sctp_send_reset_streams(asoc, !! 4240 out:
>> 4241 kfree(params);
>> 4242 return retval;
4118 } 4243 }
4119 4244
4120 static int sctp_setsockopt_reset_assoc(struct !! 4245 static int sctp_setsockopt_reset_assoc(struct sock *sk,
>> 4246 char __user *optval,
4121 unsign 4247 unsigned int optlen)
4122 { 4248 {
4123 struct sctp_association *asoc; 4249 struct sctp_association *asoc;
>> 4250 sctp_assoc_t associd;
>> 4251 int retval = -EINVAL;
4124 4252
4125 if (optlen != sizeof(*associd)) !! 4253 if (optlen != sizeof(associd))
4126 return -EINVAL; !! 4254 goto out;
4127 4255
4128 asoc = sctp_id2assoc(sk, *associd); !! 4256 if (copy_from_user(&associd, optval, optlen)) {
>> 4257 retval = -EFAULT;
>> 4258 goto out;
>> 4259 }
>> 4260
>> 4261 asoc = sctp_id2assoc(sk, associd);
4129 if (!asoc) 4262 if (!asoc)
4130 return -EINVAL; !! 4263 goto out;
>> 4264
>> 4265 retval = sctp_send_reset_assoc(asoc);
4131 4266
4132 return sctp_send_reset_assoc(asoc); !! 4267 out:
>> 4268 return retval;
4133 } 4269 }
4134 4270
4135 static int sctp_setsockopt_add_streams(struct 4271 static int sctp_setsockopt_add_streams(struct sock *sk,
4136 struct !! 4272 char __user *optval,
4137 unsign 4273 unsigned int optlen)
4138 { 4274 {
4139 struct sctp_association *asoc; 4275 struct sctp_association *asoc;
>> 4276 struct sctp_add_streams params;
>> 4277 int retval = -EINVAL;
4140 4278
4141 if (optlen != sizeof(*params)) !! 4279 if (optlen != sizeof(params))
4142 return -EINVAL; !! 4280 goto out;
4143 4281
4144 asoc = sctp_id2assoc(sk, params->sas_ !! 4282 if (copy_from_user(¶ms, optval, optlen)) {
>> 4283 retval = -EFAULT;
>> 4284 goto out;
>> 4285 }
>> 4286
>> 4287 asoc = sctp_id2assoc(sk, params.sas_assoc_id);
4145 if (!asoc) 4288 if (!asoc)
4146 return -EINVAL; !! 4289 goto out;
4147 4290
4148 return sctp_send_add_streams(asoc, pa !! 4291 retval = sctp_send_add_streams(asoc, ¶ms);
>> 4292
>> 4293 out:
>> 4294 return retval;
4149 } 4295 }
4150 4296
4151 static int sctp_setsockopt_scheduler(struct s 4297 static int sctp_setsockopt_scheduler(struct sock *sk,
4152 struct s !! 4298 char __user *optval,
4153 unsigned 4299 unsigned int optlen)
4154 { 4300 {
4155 struct sctp_sock *sp = sctp_sk(sk); 4301 struct sctp_sock *sp = sctp_sk(sk);
4156 struct sctp_association *asoc; 4302 struct sctp_association *asoc;
>> 4303 struct sctp_assoc_value params;
4157 int retval = 0; 4304 int retval = 0;
4158 4305
4159 if (optlen < sizeof(*params)) !! 4306 if (optlen < sizeof(params))
4160 return -EINVAL; 4307 return -EINVAL;
4161 4308
4162 if (params->assoc_value > SCTP_SS_MAX !! 4309 optlen = sizeof(params);
>> 4310 if (copy_from_user(¶ms, optval, optlen))
>> 4311 return -EFAULT;
>> 4312
>> 4313 if (params.assoc_value > SCTP_SS_MAX)
4163 return -EINVAL; 4314 return -EINVAL;
4164 4315
4165 asoc = sctp_id2assoc(sk, params->asso !! 4316 asoc = sctp_id2assoc(sk, params.assoc_id);
4166 if (!asoc && params->assoc_id > SCTP_ !! 4317 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4167 sctp_style(sk, UDP)) 4318 sctp_style(sk, UDP))
4168 return -EINVAL; 4319 return -EINVAL;
4169 4320
4170 if (asoc) 4321 if (asoc)
4171 return sctp_sched_set_sched(a !! 4322 return sctp_sched_set_sched(asoc, params.assoc_value);
4172 4323
4173 if (sctp_style(sk, TCP)) 4324 if (sctp_style(sk, TCP))
4174 params->assoc_id = SCTP_FUTUR !! 4325 params.assoc_id = SCTP_FUTURE_ASSOC;
4175 4326
4176 if (params->assoc_id == SCTP_FUTURE_A !! 4327 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4177 params->assoc_id == SCTP_ALL_ASSO !! 4328 params.assoc_id == SCTP_ALL_ASSOC)
4178 sp->default_ss = params->asso !! 4329 sp->default_ss = params.assoc_value;
4179 4330
4180 if (params->assoc_id == SCTP_CURRENT_ !! 4331 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4181 params->assoc_id == SCTP_ALL_ASSO !! 4332 params.assoc_id == SCTP_ALL_ASSOC) {
4182 list_for_each_entry(asoc, &sp 4333 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4183 int ret = sctp_sched_ 4334 int ret = sctp_sched_set_sched(asoc,
4184 !! 4335 params.assoc_value);
4185 4336
4186 if (ret && !retval) 4337 if (ret && !retval)
4187 retval = ret; 4338 retval = ret;
4188 } 4339 }
4189 } 4340 }
4190 4341
4191 return retval; 4342 return retval;
4192 } 4343 }
4193 4344
4194 static int sctp_setsockopt_scheduler_value(st 4345 static int sctp_setsockopt_scheduler_value(struct sock *sk,
4195 st !! 4346 char __user *optval,
4196 un 4347 unsigned int optlen)
4197 { 4348 {
>> 4349 struct sctp_stream_value params;
4198 struct sctp_association *asoc; 4350 struct sctp_association *asoc;
4199 int retval = -EINVAL; 4351 int retval = -EINVAL;
4200 4352
4201 if (optlen < sizeof(*params)) !! 4353 if (optlen < sizeof(params))
4202 goto out; 4354 goto out;
4203 4355
4204 asoc = sctp_id2assoc(sk, params->asso !! 4356 optlen = sizeof(params);
4205 if (!asoc && params->assoc_id != SCTP !! 4357 if (copy_from_user(¶ms, optval, optlen)) {
>> 4358 retval = -EFAULT;
>> 4359 goto out;
>> 4360 }
>> 4361
>> 4362 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4363 if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC &&
4206 sctp_style(sk, UDP)) 4364 sctp_style(sk, UDP))
4207 goto out; 4365 goto out;
4208 4366
4209 if (asoc) { 4367 if (asoc) {
4210 retval = sctp_sched_set_value !! 4368 retval = sctp_sched_set_value(asoc, params.stream_id,
4211 !! 4369 params.stream_value, GFP_KERNEL);
4212 goto out; 4370 goto out;
4213 } 4371 }
4214 4372
4215 retval = 0; 4373 retval = 0;
4216 4374
4217 list_for_each_entry(asoc, &sctp_sk(sk 4375 list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) {
4218 int ret = sctp_sched_set_valu !! 4376 int ret = sctp_sched_set_value(asoc, params.stream_id,
4219 !! 4377 params.stream_value, GFP_KERNEL);
4220 <<
4221 if (ret && !retval) /* try to 4378 if (ret && !retval) /* try to return the 1st error. */
4222 retval = ret; 4379 retval = ret;
4223 } 4380 }
4224 4381
4225 out: 4382 out:
4226 return retval; 4383 return retval;
4227 } 4384 }
4228 4385
4229 static int sctp_setsockopt_interleaving_suppo 4386 static int sctp_setsockopt_interleaving_supported(struct sock *sk,
4230 !! 4387 char __user *optval,
4231 4388 unsigned int optlen)
4232 { 4389 {
4233 struct sctp_sock *sp = sctp_sk(sk); 4390 struct sctp_sock *sp = sctp_sk(sk);
>> 4391 struct sctp_assoc_value params;
4234 struct sctp_association *asoc; 4392 struct sctp_association *asoc;
>> 4393 int retval = -EINVAL;
4235 4394
4236 if (optlen < sizeof(*p)) !! 4395 if (optlen < sizeof(params))
4237 return -EINVAL; !! 4396 goto out;
4238 4397
4239 asoc = sctp_id2assoc(sk, p->assoc_id) !! 4398 optlen = sizeof(params);
4240 if (!asoc && p->assoc_id != SCTP_FUTU !! 4399 if (copy_from_user(¶ms, optval, optlen)) {
4241 return -EINVAL; !! 4400 retval = -EFAULT;
>> 4401 goto out;
>> 4402 }
>> 4403
>> 4404 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4405 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
>> 4406 sctp_style(sk, UDP))
>> 4407 goto out;
4242 4408
4243 if (!sock_net(sk)->sctp.intl_enable | 4409 if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) {
4244 return -EPERM; !! 4410 retval = -EPERM;
>> 4411 goto out;
4245 } 4412 }
4246 4413
4247 sp->ep->intl_enable = !!p->assoc_valu !! 4414 sp->ep->intl_enable = !!params.assoc_value;
4248 return 0; !! 4415
>> 4416 retval = 0;
>> 4417
>> 4418 out:
>> 4419 return retval;
4249 } 4420 }
4250 4421
4251 static int sctp_setsockopt_reuse_port(struct !! 4422 static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval,
4252 unsigne 4423 unsigned int optlen)
4253 { 4424 {
>> 4425 int val;
>> 4426
4254 if (!sctp_style(sk, TCP)) 4427 if (!sctp_style(sk, TCP))
4255 return -EOPNOTSUPP; 4428 return -EOPNOTSUPP;
4256 4429
4257 if (sctp_sk(sk)->ep->base.bind_addr.p 4430 if (sctp_sk(sk)->ep->base.bind_addr.port)
4258 return -EFAULT; 4431 return -EFAULT;
4259 4432
4260 if (optlen < sizeof(int)) 4433 if (optlen < sizeof(int))
4261 return -EINVAL; 4434 return -EINVAL;
4262 4435
4263 sctp_sk(sk)->reuse = !!*val; !! 4436 if (get_user(val, (int __user *)optval))
>> 4437 return -EFAULT;
>> 4438
>> 4439 sctp_sk(sk)->reuse = !!val;
4264 4440
4265 return 0; 4441 return 0;
4266 } 4442 }
4267 4443
4268 static int sctp_assoc_ulpevent_type_set(struc 4444 static int sctp_assoc_ulpevent_type_set(struct sctp_event *param,
4269 struc 4445 struct sctp_association *asoc)
4270 { 4446 {
4271 struct sctp_ulpevent *event; 4447 struct sctp_ulpevent *event;
4272 4448
4273 sctp_ulpevent_type_set(&asoc->subscri 4449 sctp_ulpevent_type_set(&asoc->subscribe, param->se_type, param->se_on);
4274 4450
4275 if (param->se_type == SCTP_SENDER_DRY 4451 if (param->se_type == SCTP_SENDER_DRY_EVENT && param->se_on) {
4276 if (sctp_outq_is_empty(&asoc- 4452 if (sctp_outq_is_empty(&asoc->outqueue)) {
4277 event = sctp_ulpevent 4453 event = sctp_ulpevent_make_sender_dry_event(asoc,
4278 GFP_U 4454 GFP_USER | __GFP_NOWARN);
4279 if (!event) 4455 if (!event)
4280 return -ENOME 4456 return -ENOMEM;
4281 4457
4282 asoc->stream.si->enqu 4458 asoc->stream.si->enqueue_event(&asoc->ulpq, event);
4283 } 4459 }
4284 } 4460 }
4285 4461
4286 return 0; 4462 return 0;
4287 } 4463 }
4288 4464
4289 static int sctp_setsockopt_event(struct sock !! 4465 static int sctp_setsockopt_event(struct sock *sk, char __user *optval,
4290 unsigned int 4466 unsigned int optlen)
4291 { 4467 {
4292 struct sctp_sock *sp = sctp_sk(sk); 4468 struct sctp_sock *sp = sctp_sk(sk);
4293 struct sctp_association *asoc; 4469 struct sctp_association *asoc;
>> 4470 struct sctp_event param;
4294 int retval = 0; 4471 int retval = 0;
4295 4472
4296 if (optlen < sizeof(*param)) !! 4473 if (optlen < sizeof(param))
4297 return -EINVAL; 4474 return -EINVAL;
4298 4475
4299 if (param->se_type < SCTP_SN_TYPE_BAS !! 4476 optlen = sizeof(param);
4300 param->se_type > SCTP_SN_TYPE_MAX !! 4477 if (copy_from_user(¶m, optval, optlen))
>> 4478 return -EFAULT;
>> 4479
>> 4480 if (param.se_type < SCTP_SN_TYPE_BASE ||
>> 4481 param.se_type > SCTP_SN_TYPE_MAX)
4301 return -EINVAL; 4482 return -EINVAL;
4302 4483
4303 asoc = sctp_id2assoc(sk, param->se_as !! 4484 asoc = sctp_id2assoc(sk, param.se_assoc_id);
4304 if (!asoc && param->se_assoc_id > SCT !! 4485 if (!asoc && param.se_assoc_id > SCTP_ALL_ASSOC &&
4305 sctp_style(sk, UDP)) 4486 sctp_style(sk, UDP))
4306 return -EINVAL; 4487 return -EINVAL;
4307 4488
4308 if (asoc) 4489 if (asoc)
4309 return sctp_assoc_ulpevent_ty !! 4490 return sctp_assoc_ulpevent_type_set(¶m, asoc);
4310 4491
4311 if (sctp_style(sk, TCP)) 4492 if (sctp_style(sk, TCP))
4312 param->se_assoc_id = SCTP_FUT !! 4493 param.se_assoc_id = SCTP_FUTURE_ASSOC;
4313 4494
4314 if (param->se_assoc_id == SCTP_FUTURE !! 4495 if (param.se_assoc_id == SCTP_FUTURE_ASSOC ||
4315 param->se_assoc_id == SCTP_ALL_AS !! 4496 param.se_assoc_id == SCTP_ALL_ASSOC)
4316 sctp_ulpevent_type_set(&sp->s 4497 sctp_ulpevent_type_set(&sp->subscribe,
4317 param- !! 4498 param.se_type, param.se_on);
4318 4499
4319 if (param->se_assoc_id == SCTP_CURREN !! 4500 if (param.se_assoc_id == SCTP_CURRENT_ASSOC ||
4320 param->se_assoc_id == SCTP_ALL_AS !! 4501 param.se_assoc_id == SCTP_ALL_ASSOC) {
4321 list_for_each_entry(asoc, &sp 4502 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4322 int ret = sctp_assoc_ !! 4503 int ret = sctp_assoc_ulpevent_type_set(¶m, asoc);
4323 4504
4324 if (ret && !retval) 4505 if (ret && !retval)
4325 retval = ret; 4506 retval = ret;
4326 } 4507 }
4327 } 4508 }
4328 4509
4329 return retval; 4510 return retval;
4330 } 4511 }
4331 4512
4332 static int sctp_setsockopt_asconf_supported(s 4513 static int sctp_setsockopt_asconf_supported(struct sock *sk,
4333 s !! 4514 char __user *optval,
4334 u 4515 unsigned int optlen)
4335 { 4516 {
>> 4517 struct sctp_assoc_value params;
4336 struct sctp_association *asoc; 4518 struct sctp_association *asoc;
4337 struct sctp_endpoint *ep; 4519 struct sctp_endpoint *ep;
4338 int retval = -EINVAL; 4520 int retval = -EINVAL;
4339 4521
4340 if (optlen != sizeof(*params)) !! 4522 if (optlen != sizeof(params))
4341 goto out; 4523 goto out;
4342 4524
4343 asoc = sctp_id2assoc(sk, params->asso !! 4525 if (copy_from_user(¶ms, optval, optlen)) {
4344 if (!asoc && params->assoc_id != SCTP !! 4526 retval = -EFAULT;
>> 4527 goto out;
>> 4528 }
>> 4529
>> 4530 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4531 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4345 sctp_style(sk, UDP)) 4532 sctp_style(sk, UDP))
4346 goto out; 4533 goto out;
4347 4534
4348 ep = sctp_sk(sk)->ep; 4535 ep = sctp_sk(sk)->ep;
4349 ep->asconf_enable = !!params->assoc_v !! 4536 ep->asconf_enable = !!params.assoc_value;
4350 4537
4351 if (ep->asconf_enable && ep->auth_ena 4538 if (ep->asconf_enable && ep->auth_enable) {
4352 sctp_auth_ep_add_chunkid(ep, 4539 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
4353 sctp_auth_ep_add_chunkid(ep, 4540 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF_ACK);
4354 } 4541 }
4355 4542
4356 retval = 0; 4543 retval = 0;
4357 4544
4358 out: 4545 out:
4359 return retval; 4546 return retval;
4360 } 4547 }
4361 4548
4362 static int sctp_setsockopt_auth_supported(str 4549 static int sctp_setsockopt_auth_supported(struct sock *sk,
4363 str !! 4550 char __user *optval,
4364 uns 4551 unsigned int optlen)
4365 { 4552 {
>> 4553 struct sctp_assoc_value params;
4366 struct sctp_association *asoc; 4554 struct sctp_association *asoc;
4367 struct sctp_endpoint *ep; 4555 struct sctp_endpoint *ep;
4368 int retval = -EINVAL; 4556 int retval = -EINVAL;
4369 4557
4370 if (optlen != sizeof(*params)) !! 4558 if (optlen != sizeof(params))
4371 goto out; 4559 goto out;
4372 4560
4373 asoc = sctp_id2assoc(sk, params->asso !! 4561 if (copy_from_user(¶ms, optval, optlen)) {
4374 if (!asoc && params->assoc_id != SCTP !! 4562 retval = -EFAULT;
>> 4563 goto out;
>> 4564 }
>> 4565
>> 4566 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4567 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4375 sctp_style(sk, UDP)) 4568 sctp_style(sk, UDP))
4376 goto out; 4569 goto out;
4377 4570
4378 ep = sctp_sk(sk)->ep; 4571 ep = sctp_sk(sk)->ep;
4379 if (params->assoc_value) { !! 4572 if (params.assoc_value) {
4380 retval = sctp_auth_init(ep, G 4573 retval = sctp_auth_init(ep, GFP_KERNEL);
4381 if (retval) 4574 if (retval)
4382 goto out; 4575 goto out;
4383 if (ep->asconf_enable) { 4576 if (ep->asconf_enable) {
4384 sctp_auth_ep_add_chun 4577 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
4385 sctp_auth_ep_add_chun 4578 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF_ACK);
4386 } 4579 }
4387 } 4580 }
4388 4581
4389 ep->auth_enable = !!params->assoc_val !! 4582 ep->auth_enable = !!params.assoc_value;
4390 retval = 0; 4583 retval = 0;
4391 4584
4392 out: 4585 out:
4393 return retval; 4586 return retval;
4394 } 4587 }
4395 4588
4396 static int sctp_setsockopt_ecn_supported(stru 4589 static int sctp_setsockopt_ecn_supported(struct sock *sk,
4397 stru !! 4590 char __user *optval,
4398 unsi 4591 unsigned int optlen)
4399 { 4592 {
>> 4593 struct sctp_assoc_value params;
4400 struct sctp_association *asoc; 4594 struct sctp_association *asoc;
4401 int retval = -EINVAL; 4595 int retval = -EINVAL;
4402 4596
4403 if (optlen != sizeof(*params)) !! 4597 if (optlen != sizeof(params))
4404 goto out; 4598 goto out;
4405 4599
4406 asoc = sctp_id2assoc(sk, params->asso !! 4600 if (copy_from_user(¶ms, optval, optlen)) {
4407 if (!asoc && params->assoc_id != SCTP !! 4601 retval = -EFAULT;
>> 4602 goto out;
>> 4603 }
>> 4604
>> 4605 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4606 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4408 sctp_style(sk, UDP)) 4607 sctp_style(sk, UDP))
4409 goto out; 4608 goto out;
4410 4609
4411 sctp_sk(sk)->ep->ecn_enable = !!param !! 4610 sctp_sk(sk)->ep->ecn_enable = !!params.assoc_value;
4412 retval = 0; 4611 retval = 0;
4413 4612
4414 out: 4613 out:
4415 return retval; 4614 return retval;
4416 } 4615 }
4417 4616
4418 static int sctp_setsockopt_pf_expose(struct s 4617 static int sctp_setsockopt_pf_expose(struct sock *sk,
4419 struct s !! 4618 char __user *optval,
4420 unsigned 4619 unsigned int optlen)
4421 { 4620 {
>> 4621 struct sctp_assoc_value params;
4422 struct sctp_association *asoc; 4622 struct sctp_association *asoc;
4423 int retval = -EINVAL; 4623 int retval = -EINVAL;
4424 4624
4425 if (optlen != sizeof(*params)) !! 4625 if (optlen != sizeof(params))
4426 goto out; 4626 goto out;
4427 4627
4428 if (params->assoc_value > SCTP_PF_EXP !! 4628 if (copy_from_user(¶ms, optval, optlen)) {
>> 4629 retval = -EFAULT;
>> 4630 goto out;
>> 4631 }
>> 4632
>> 4633 if (params.assoc_value > SCTP_PF_EXPOSE_MAX)
4429 goto out; 4634 goto out;
4430 4635
4431 asoc = sctp_id2assoc(sk, params->asso !! 4636 asoc = sctp_id2assoc(sk, params.assoc_id);
4432 if (!asoc && params->assoc_id != SCTP !! 4637 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4433 sctp_style(sk, UDP)) 4638 sctp_style(sk, UDP))
4434 goto out; 4639 goto out;
4435 4640
4436 if (asoc) 4641 if (asoc)
4437 asoc->pf_expose = params->ass !! 4642 asoc->pf_expose = params.assoc_value;
4438 else 4643 else
4439 sctp_sk(sk)->pf_expose = para !! 4644 sctp_sk(sk)->pf_expose = params.assoc_value;
4440 retval = 0; 4645 retval = 0;
4441 4646
4442 out: 4647 out:
4443 return retval; 4648 return retval;
4444 } 4649 }
4445 4650
4446 static int sctp_setsockopt_encap_port(struct <<
4447 struct <<
4448 unsigne <<
4449 { <<
4450 struct sctp_association *asoc; <<
4451 struct sctp_transport *t; <<
4452 __be16 encap_port; <<
4453 <<
4454 if (optlen != sizeof(*encap)) <<
4455 return -EINVAL; <<
4456 <<
4457 /* If an address other than INADDR_AN <<
4458 * no transport is found, then the re <<
4459 */ <<
4460 encap_port = (__force __be16)encap->s <<
4461 if (!sctp_is_any(sk, (union sctp_addr <<
4462 t = sctp_addr_id2transport(sk <<
4463 en <<
4464 if (!t) <<
4465 return -EINVAL; <<
4466 <<
4467 t->encap_port = encap_port; <<
4468 return 0; <<
4469 } <<
4470 <<
4471 /* Get association, if assoc_id != SC <<
4472 * socket is a one to many style sock <<
4473 * was not found, then the id was inv <<
4474 */ <<
4475 asoc = sctp_id2assoc(sk, encap->sue_a <<
4476 if (!asoc && encap->sue_assoc_id != S <<
4477 sctp_style(sk, UDP)) <<
4478 return -EINVAL; <<
4479 <<
4480 /* If changes are for association, al <<
4481 * each transport. <<
4482 */ <<
4483 if (asoc) { <<
4484 list_for_each_entry(t, &asoc- <<
4485 transport <<
4486 t->encap_port = encap <<
4487 <<
4488 asoc->encap_port = encap_port <<
4489 return 0; <<
4490 } <<
4491 <<
4492 sctp_sk(sk)->encap_port = encap_port; <<
4493 return 0; <<
4494 } <<
4495 <<
4496 static int sctp_setsockopt_probe_interval(str <<
4497 str <<
4498 uns <<
4499 { <<
4500 struct sctp_association *asoc; <<
4501 struct sctp_transport *t; <<
4502 __u32 probe_interval; <<
4503 <<
4504 if (optlen != sizeof(*params)) <<
4505 return -EINVAL; <<
4506 <<
4507 probe_interval = params->spi_interval <<
4508 if (probe_interval && probe_interval <<
4509 return -EINVAL; <<
4510 <<
4511 /* If an address other than INADDR_AN <<
4512 * no transport is found, then the re <<
4513 */ <<
4514 if (!sctp_is_any(sk, (union sctp_addr <<
4515 t = sctp_addr_id2transport(sk <<
4516 pa <<
4517 if (!t) <<
4518 return -EINVAL; <<
4519 <<
4520 t->probe_interval = msecs_to_ <<
4521 sctp_transport_pl_reset(t); <<
4522 return 0; <<
4523 } <<
4524 <<
4525 /* Get association, if assoc_id != SC <<
4526 * socket is a one to many style sock <<
4527 * was not found, then the id was inv <<
4528 */ <<
4529 asoc = sctp_id2assoc(sk, params->spi_ <<
4530 if (!asoc && params->spi_assoc_id != <<
4531 sctp_style(sk, UDP)) <<
4532 return -EINVAL; <<
4533 <<
4534 /* If changes are for association, al <<
4535 * each transport. <<
4536 */ <<
4537 if (asoc) { <<
4538 list_for_each_entry(t, &asoc- <<
4539 t->probe_interval = m <<
4540 sctp_transport_pl_res <<
4541 } <<
4542 <<
4543 asoc->probe_interval = msecs_ <<
4544 return 0; <<
4545 } <<
4546 <<
4547 sctp_sk(sk)->probe_interval = probe_i <<
4548 return 0; <<
4549 } <<
4550 <<
4551 /* API 6.2 setsockopt(), getsockopt() 4651 /* API 6.2 setsockopt(), getsockopt()
4552 * 4652 *
4553 * Applications use setsockopt() and getsocko 4653 * Applications use setsockopt() and getsockopt() to set or retrieve
4554 * socket options. Socket options are used t 4654 * socket options. Socket options are used to change the default
4555 * behavior of sockets calls. They are descr 4655 * behavior of sockets calls. They are described in Section 7.
4556 * 4656 *
4557 * The syntax is: 4657 * The syntax is:
4558 * 4658 *
4559 * ret = getsockopt(int sd, int level, int 4659 * ret = getsockopt(int sd, int level, int optname, void __user *optval,
4560 * int __user *optlen); 4660 * int __user *optlen);
4561 * ret = setsockopt(int sd, int level, int 4661 * ret = setsockopt(int sd, int level, int optname, const void __user *optval,
4562 * int optlen); 4662 * int optlen);
4563 * 4663 *
4564 * sd - the socket descript. 4664 * sd - the socket descript.
4565 * level - set to IPPROTO_SCTP for all SC 4665 * level - set to IPPROTO_SCTP for all SCTP options.
4566 * optname - the option name. 4666 * optname - the option name.
4567 * optval - the buffer to store the value 4667 * optval - the buffer to store the value of the option.
4568 * optlen - the size of the buffer. 4668 * optlen - the size of the buffer.
4569 */ 4669 */
4570 static int sctp_setsockopt(struct sock *sk, i 4670 static int sctp_setsockopt(struct sock *sk, int level, int optname,
4571 sockptr_t optval, !! 4671 char __user *optval, unsigned int optlen)
4572 { 4672 {
4573 void *kopt = NULL; <<
4574 int retval = 0; 4673 int retval = 0;
4575 4674
4576 pr_debug("%s: sk:%p, optname:%d\n", _ 4675 pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
4577 4676
4578 /* I can hardly begin to describe how 4677 /* I can hardly begin to describe how wrong this is. This is
4579 * so broken as to be worse than usel 4678 * so broken as to be worse than useless. The API draft
4580 * REALLY is NOT helpful here... I a 4679 * REALLY is NOT helpful here... I am not convinced that the
4581 * semantics of setsockopt() with a l 4680 * semantics of setsockopt() with a level OTHER THAN SOL_SCTP
4582 * are at all well-founded. 4681 * are at all well-founded.
4583 */ 4682 */
4584 if (level != SOL_SCTP) { 4683 if (level != SOL_SCTP) {
4585 struct sctp_af *af = sctp_sk( 4684 struct sctp_af *af = sctp_sk(sk)->pf->af;
4586 !! 4685 retval = af->setsockopt(sk, level, optname, optval, optlen);
4587 return af->setsockopt(sk, lev !! 4686 goto out_nounlock;
4588 } <<
4589 <<
4590 if (optlen > 0) { <<
4591 /* Trim it to the biggest siz <<
4592 optlen = min_t(unsigned int, <<
4593 PAGE_ALIGN(USH <<
4594 siz <<
4595 kopt = memdup_sockptr(optval, <<
4596 if (IS_ERR(kopt)) <<
4597 return PTR_ERR(kopt); <<
4598 } 4687 }
4599 4688
4600 lock_sock(sk); 4689 lock_sock(sk);
4601 4690
4602 switch (optname) { 4691 switch (optname) {
4603 case SCTP_SOCKOPT_BINDX_ADD: 4692 case SCTP_SOCKOPT_BINDX_ADD:
4604 /* 'optlen' is the size of th 4693 /* 'optlen' is the size of the addresses buffer. */
4605 retval = sctp_setsockopt_bind !! 4694 retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4606 !! 4695 optlen, SCTP_BINDX_ADD_ADDR);
4607 break; 4696 break;
4608 4697
4609 case SCTP_SOCKOPT_BINDX_REM: 4698 case SCTP_SOCKOPT_BINDX_REM:
4610 /* 'optlen' is the size of th 4699 /* 'optlen' is the size of the addresses buffer. */
4611 retval = sctp_setsockopt_bind !! 4700 retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4612 !! 4701 optlen, SCTP_BINDX_REM_ADDR);
4613 break; 4702 break;
4614 4703
4615 case SCTP_SOCKOPT_CONNECTX_OLD: 4704 case SCTP_SOCKOPT_CONNECTX_OLD:
4616 /* 'optlen' is the size of th 4705 /* 'optlen' is the size of the addresses buffer. */
4617 retval = sctp_setsockopt_conn !! 4706 retval = sctp_setsockopt_connectx_old(sk,
>> 4707 (struct sockaddr __user *)optval,
>> 4708 optlen);
4618 break; 4709 break;
4619 4710
4620 case SCTP_SOCKOPT_CONNECTX: 4711 case SCTP_SOCKOPT_CONNECTX:
4621 /* 'optlen' is the size of th 4712 /* 'optlen' is the size of the addresses buffer. */
4622 retval = sctp_setsockopt_conn !! 4713 retval = sctp_setsockopt_connectx(sk,
>> 4714 (struct sockaddr __user *)optval,
>> 4715 optlen);
4623 break; 4716 break;
4624 4717
4625 case SCTP_DISABLE_FRAGMENTS: 4718 case SCTP_DISABLE_FRAGMENTS:
4626 retval = sctp_setsockopt_disa !! 4719 retval = sctp_setsockopt_disable_fragments(sk, optval, optlen);
4627 break; 4720 break;
4628 4721
4629 case SCTP_EVENTS: 4722 case SCTP_EVENTS:
4630 retval = sctp_setsockopt_even !! 4723 retval = sctp_setsockopt_events(sk, optval, optlen);
4631 break; 4724 break;
4632 4725
4633 case SCTP_AUTOCLOSE: 4726 case SCTP_AUTOCLOSE:
4634 retval = sctp_setsockopt_auto !! 4727 retval = sctp_setsockopt_autoclose(sk, optval, optlen);
4635 break; 4728 break;
4636 4729
4637 case SCTP_PEER_ADDR_PARAMS: 4730 case SCTP_PEER_ADDR_PARAMS:
4638 retval = sctp_setsockopt_peer !! 4731 retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
4639 break; 4732 break;
4640 4733
4641 case SCTP_DELAYED_SACK: 4734 case SCTP_DELAYED_SACK:
4642 retval = sctp_setsockopt_dela !! 4735 retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
4643 break; 4736 break;
4644 case SCTP_PARTIAL_DELIVERY_POINT: 4737 case SCTP_PARTIAL_DELIVERY_POINT:
4645 retval = sctp_setsockopt_part !! 4738 retval = sctp_setsockopt_partial_delivery_point(sk, optval, optlen);
4646 break; 4739 break;
4647 4740
4648 case SCTP_INITMSG: 4741 case SCTP_INITMSG:
4649 retval = sctp_setsockopt_init !! 4742 retval = sctp_setsockopt_initmsg(sk, optval, optlen);
4650 break; 4743 break;
4651 case SCTP_DEFAULT_SEND_PARAM: 4744 case SCTP_DEFAULT_SEND_PARAM:
4652 retval = sctp_setsockopt_defa !! 4745 retval = sctp_setsockopt_default_send_param(sk, optval,
>> 4746 optlen);
4653 break; 4747 break;
4654 case SCTP_DEFAULT_SNDINFO: 4748 case SCTP_DEFAULT_SNDINFO:
4655 retval = sctp_setsockopt_defa !! 4749 retval = sctp_setsockopt_default_sndinfo(sk, optval, optlen);
4656 break; 4750 break;
4657 case SCTP_PRIMARY_ADDR: 4751 case SCTP_PRIMARY_ADDR:
4658 retval = sctp_setsockopt_prim !! 4752 retval = sctp_setsockopt_primary_addr(sk, optval, optlen);
4659 break; 4753 break;
4660 case SCTP_SET_PEER_PRIMARY_ADDR: 4754 case SCTP_SET_PEER_PRIMARY_ADDR:
4661 retval = sctp_setsockopt_peer !! 4755 retval = sctp_setsockopt_peer_primary_addr(sk, optval, optlen);
4662 break; 4756 break;
4663 case SCTP_NODELAY: 4757 case SCTP_NODELAY:
4664 retval = sctp_setsockopt_node !! 4758 retval = sctp_setsockopt_nodelay(sk, optval, optlen);
4665 break; 4759 break;
4666 case SCTP_RTOINFO: 4760 case SCTP_RTOINFO:
4667 retval = sctp_setsockopt_rtoi !! 4761 retval = sctp_setsockopt_rtoinfo(sk, optval, optlen);
4668 break; 4762 break;
4669 case SCTP_ASSOCINFO: 4763 case SCTP_ASSOCINFO:
4670 retval = sctp_setsockopt_asso !! 4764 retval = sctp_setsockopt_associnfo(sk, optval, optlen);
4671 break; 4765 break;
4672 case SCTP_I_WANT_MAPPED_V4_ADDR: 4766 case SCTP_I_WANT_MAPPED_V4_ADDR:
4673 retval = sctp_setsockopt_mapp !! 4767 retval = sctp_setsockopt_mappedv4(sk, optval, optlen);
4674 break; 4768 break;
4675 case SCTP_MAXSEG: 4769 case SCTP_MAXSEG:
4676 retval = sctp_setsockopt_maxs !! 4770 retval = sctp_setsockopt_maxseg(sk, optval, optlen);
4677 break; 4771 break;
4678 case SCTP_ADAPTATION_LAYER: 4772 case SCTP_ADAPTATION_LAYER:
4679 retval = sctp_setsockopt_adap !! 4773 retval = sctp_setsockopt_adaptation_layer(sk, optval, optlen);
4680 break; 4774 break;
4681 case SCTP_CONTEXT: 4775 case SCTP_CONTEXT:
4682 retval = sctp_setsockopt_cont !! 4776 retval = sctp_setsockopt_context(sk, optval, optlen);
4683 break; 4777 break;
4684 case SCTP_FRAGMENT_INTERLEAVE: 4778 case SCTP_FRAGMENT_INTERLEAVE:
4685 retval = sctp_setsockopt_frag !! 4779 retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen);
4686 break; 4780 break;
4687 case SCTP_MAX_BURST: 4781 case SCTP_MAX_BURST:
4688 retval = sctp_setsockopt_maxb !! 4782 retval = sctp_setsockopt_maxburst(sk, optval, optlen);
4689 break; 4783 break;
4690 case SCTP_AUTH_CHUNK: 4784 case SCTP_AUTH_CHUNK:
4691 retval = sctp_setsockopt_auth !! 4785 retval = sctp_setsockopt_auth_chunk(sk, optval, optlen);
4692 break; 4786 break;
4693 case SCTP_HMAC_IDENT: 4787 case SCTP_HMAC_IDENT:
4694 retval = sctp_setsockopt_hmac !! 4788 retval = sctp_setsockopt_hmac_ident(sk, optval, optlen);
4695 break; 4789 break;
4696 case SCTP_AUTH_KEY: 4790 case SCTP_AUTH_KEY:
4697 retval = sctp_setsockopt_auth !! 4791 retval = sctp_setsockopt_auth_key(sk, optval, optlen);
4698 break; 4792 break;
4699 case SCTP_AUTH_ACTIVE_KEY: 4793 case SCTP_AUTH_ACTIVE_KEY:
4700 retval = sctp_setsockopt_acti !! 4794 retval = sctp_setsockopt_active_key(sk, optval, optlen);
4701 break; 4795 break;
4702 case SCTP_AUTH_DELETE_KEY: 4796 case SCTP_AUTH_DELETE_KEY:
4703 retval = sctp_setsockopt_del_ !! 4797 retval = sctp_setsockopt_del_key(sk, optval, optlen);
4704 break; 4798 break;
4705 case SCTP_AUTH_DEACTIVATE_KEY: 4799 case SCTP_AUTH_DEACTIVATE_KEY:
4706 retval = sctp_setsockopt_deac !! 4800 retval = sctp_setsockopt_deactivate_key(sk, optval, optlen);
4707 break; 4801 break;
4708 case SCTP_AUTO_ASCONF: 4802 case SCTP_AUTO_ASCONF:
4709 retval = sctp_setsockopt_auto !! 4803 retval = sctp_setsockopt_auto_asconf(sk, optval, optlen);
4710 break; 4804 break;
4711 case SCTP_PEER_ADDR_THLDS: 4805 case SCTP_PEER_ADDR_THLDS:
4712 retval = sctp_setsockopt_padd !! 4806 retval = sctp_setsockopt_paddr_thresholds(sk, optval, optlen,
4713 4807 false);
4714 break; 4808 break;
4715 case SCTP_PEER_ADDR_THLDS_V2: 4809 case SCTP_PEER_ADDR_THLDS_V2:
4716 retval = sctp_setsockopt_padd !! 4810 retval = sctp_setsockopt_paddr_thresholds(sk, optval, optlen,
4717 4811 true);
4718 break; 4812 break;
4719 case SCTP_RECVRCVINFO: 4813 case SCTP_RECVRCVINFO:
4720 retval = sctp_setsockopt_recv !! 4814 retval = sctp_setsockopt_recvrcvinfo(sk, optval, optlen);
4721 break; 4815 break;
4722 case SCTP_RECVNXTINFO: 4816 case SCTP_RECVNXTINFO:
4723 retval = sctp_setsockopt_recv !! 4817 retval = sctp_setsockopt_recvnxtinfo(sk, optval, optlen);
4724 break; 4818 break;
4725 case SCTP_PR_SUPPORTED: 4819 case SCTP_PR_SUPPORTED:
4726 retval = sctp_setsockopt_pr_s !! 4820 retval = sctp_setsockopt_pr_supported(sk, optval, optlen);
4727 break; 4821 break;
4728 case SCTP_DEFAULT_PRINFO: 4822 case SCTP_DEFAULT_PRINFO:
4729 retval = sctp_setsockopt_defa !! 4823 retval = sctp_setsockopt_default_prinfo(sk, optval, optlen);
4730 break; 4824 break;
4731 case SCTP_RECONFIG_SUPPORTED: 4825 case SCTP_RECONFIG_SUPPORTED:
4732 retval = sctp_setsockopt_reco !! 4826 retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen);
4733 break; 4827 break;
4734 case SCTP_ENABLE_STREAM_RESET: 4828 case SCTP_ENABLE_STREAM_RESET:
4735 retval = sctp_setsockopt_enab !! 4829 retval = sctp_setsockopt_enable_strreset(sk, optval, optlen);
4736 break; 4830 break;
4737 case SCTP_RESET_STREAMS: 4831 case SCTP_RESET_STREAMS:
4738 retval = sctp_setsockopt_rese !! 4832 retval = sctp_setsockopt_reset_streams(sk, optval, optlen);
4739 break; 4833 break;
4740 case SCTP_RESET_ASSOC: 4834 case SCTP_RESET_ASSOC:
4741 retval = sctp_setsockopt_rese !! 4835 retval = sctp_setsockopt_reset_assoc(sk, optval, optlen);
4742 break; 4836 break;
4743 case SCTP_ADD_STREAMS: 4837 case SCTP_ADD_STREAMS:
4744 retval = sctp_setsockopt_add_ !! 4838 retval = sctp_setsockopt_add_streams(sk, optval, optlen);
4745 break; 4839 break;
4746 case SCTP_STREAM_SCHEDULER: 4840 case SCTP_STREAM_SCHEDULER:
4747 retval = sctp_setsockopt_sche !! 4841 retval = sctp_setsockopt_scheduler(sk, optval, optlen);
4748 break; 4842 break;
4749 case SCTP_STREAM_SCHEDULER_VALUE: 4843 case SCTP_STREAM_SCHEDULER_VALUE:
4750 retval = sctp_setsockopt_sche !! 4844 retval = sctp_setsockopt_scheduler_value(sk, optval, optlen);
4751 break; 4845 break;
4752 case SCTP_INTERLEAVING_SUPPORTED: 4846 case SCTP_INTERLEAVING_SUPPORTED:
4753 retval = sctp_setsockopt_inte !! 4847 retval = sctp_setsockopt_interleaving_supported(sk, optval,
4754 4848 optlen);
4755 break; 4849 break;
4756 case SCTP_REUSE_PORT: 4850 case SCTP_REUSE_PORT:
4757 retval = sctp_setsockopt_reus !! 4851 retval = sctp_setsockopt_reuse_port(sk, optval, optlen);
4758 break; 4852 break;
4759 case SCTP_EVENT: 4853 case SCTP_EVENT:
4760 retval = sctp_setsockopt_even !! 4854 retval = sctp_setsockopt_event(sk, optval, optlen);
4761 break; 4855 break;
4762 case SCTP_ASCONF_SUPPORTED: 4856 case SCTP_ASCONF_SUPPORTED:
4763 retval = sctp_setsockopt_asco !! 4857 retval = sctp_setsockopt_asconf_supported(sk, optval, optlen);
4764 break; 4858 break;
4765 case SCTP_AUTH_SUPPORTED: 4859 case SCTP_AUTH_SUPPORTED:
4766 retval = sctp_setsockopt_auth !! 4860 retval = sctp_setsockopt_auth_supported(sk, optval, optlen);
4767 break; 4861 break;
4768 case SCTP_ECN_SUPPORTED: 4862 case SCTP_ECN_SUPPORTED:
4769 retval = sctp_setsockopt_ecn_ !! 4863 retval = sctp_setsockopt_ecn_supported(sk, optval, optlen);
4770 break; 4864 break;
4771 case SCTP_EXPOSE_POTENTIALLY_FAILED_S 4865 case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
4772 retval = sctp_setsockopt_pf_e !! 4866 retval = sctp_setsockopt_pf_expose(sk, optval, optlen);
4773 break; <<
4774 case SCTP_REMOTE_UDP_ENCAPS_PORT: <<
4775 retval = sctp_setsockopt_enca <<
4776 break; <<
4777 case SCTP_PLPMTUD_PROBE_INTERVAL: <<
4778 retval = sctp_setsockopt_prob <<
4779 break; 4867 break;
4780 default: 4868 default:
4781 retval = -ENOPROTOOPT; 4869 retval = -ENOPROTOOPT;
4782 break; 4870 break;
4783 } 4871 }
4784 4872
4785 release_sock(sk); 4873 release_sock(sk);
4786 kfree(kopt); !! 4874
>> 4875 out_nounlock:
4787 return retval; 4876 return retval;
4788 } 4877 }
4789 4878
4790 /* API 3.1.6 connect() - UDP Style Syntax 4879 /* API 3.1.6 connect() - UDP Style Syntax
4791 * 4880 *
4792 * An application may use the connect() call 4881 * An application may use the connect() call in the UDP model to initiate an
4793 * association without sending data. 4882 * association without sending data.
4794 * 4883 *
4795 * The syntax is: 4884 * The syntax is:
4796 * 4885 *
4797 * ret = connect(int sd, const struct sockadd 4886 * ret = connect(int sd, const struct sockaddr *nam, socklen_t len);
4798 * 4887 *
4799 * sd: the socket descriptor to have a new as 4888 * sd: the socket descriptor to have a new association added to.
4800 * 4889 *
4801 * nam: the address structure (either struct 4890 * nam: the address structure (either struct sockaddr_in or struct
4802 * sockaddr_in6 defined in RFC2553 [7]). 4891 * sockaddr_in6 defined in RFC2553 [7]).
4803 * 4892 *
4804 * len: the size of the address. 4893 * len: the size of the address.
4805 */ 4894 */
4806 static int sctp_connect(struct sock *sk, stru 4895 static int sctp_connect(struct sock *sk, struct sockaddr *addr,
4807 int addr_len, int fla 4896 int addr_len, int flags)
4808 { 4897 {
4809 struct sctp_af *af; 4898 struct sctp_af *af;
4810 int err = -EINVAL; 4899 int err = -EINVAL;
4811 4900
4812 lock_sock(sk); 4901 lock_sock(sk);
4813 pr_debug("%s: sk:%p, sockaddr:%p, add 4902 pr_debug("%s: sk:%p, sockaddr:%p, addr_len:%d\n", __func__, sk,
4814 addr, addr_len); 4903 addr, addr_len);
4815 4904
4816 /* Validate addr_len before calling c 4905 /* Validate addr_len before calling common connect/connectx routine. */
4817 af = sctp_get_af_specific(addr->sa_fa 4906 af = sctp_get_af_specific(addr->sa_family);
4818 if (af && addr_len >= af->sockaddr_le 4907 if (af && addr_len >= af->sockaddr_len)
4819 err = __sctp_connect(sk, addr 4908 err = __sctp_connect(sk, addr, af->sockaddr_len, flags, NULL);
4820 4909
4821 release_sock(sk); 4910 release_sock(sk);
4822 return err; 4911 return err;
4823 } 4912 }
4824 4913
4825 int sctp_inet_connect(struct socket *sock, st 4914 int sctp_inet_connect(struct socket *sock, struct sockaddr *uaddr,
4826 int addr_len, int flags 4915 int addr_len, int flags)
4827 { 4916 {
4828 if (addr_len < sizeof(uaddr->sa_famil 4917 if (addr_len < sizeof(uaddr->sa_family))
4829 return -EINVAL; 4918 return -EINVAL;
4830 4919
4831 if (uaddr->sa_family == AF_UNSPEC) 4920 if (uaddr->sa_family == AF_UNSPEC)
4832 return -EOPNOTSUPP; 4921 return -EOPNOTSUPP;
4833 4922
4834 return sctp_connect(sock->sk, uaddr, 4923 return sctp_connect(sock->sk, uaddr, addr_len, flags);
4835 } 4924 }
4836 4925
4837 /* Only called when shutdown a listening SCTP !! 4926 /* FIXME: Write comments. */
4838 static int sctp_disconnect(struct sock *sk, i 4927 static int sctp_disconnect(struct sock *sk, int flags)
4839 { 4928 {
4840 if (!sctp_style(sk, TCP)) !! 4929 return -EOPNOTSUPP; /* STUB */
4841 return -EOPNOTSUPP; <<
4842 <<
4843 sk->sk_shutdown |= RCV_SHUTDOWN; <<
4844 return 0; <<
4845 } 4930 }
4846 4931
4847 /* 4.1.4 accept() - TCP Style Syntax 4932 /* 4.1.4 accept() - TCP Style Syntax
4848 * 4933 *
4849 * Applications use accept() call to remove a 4934 * Applications use accept() call to remove an established SCTP
4850 * association from the accept queue of the e 4935 * association from the accept queue of the endpoint. A new socket
4851 * descriptor will be returned from accept() 4936 * descriptor will be returned from accept() to represent the newly
4852 * formed association. 4937 * formed association.
4853 */ 4938 */
4854 static struct sock *sctp_accept(struct sock * !! 4939 static struct sock *sctp_accept(struct sock *sk, int flags, int *err, bool kern)
4855 { 4940 {
4856 struct sctp_sock *sp; 4941 struct sctp_sock *sp;
4857 struct sctp_endpoint *ep; 4942 struct sctp_endpoint *ep;
4858 struct sock *newsk = NULL; 4943 struct sock *newsk = NULL;
4859 struct sctp_association *asoc; 4944 struct sctp_association *asoc;
4860 long timeo; 4945 long timeo;
4861 int error = 0; 4946 int error = 0;
4862 4947
4863 lock_sock(sk); 4948 lock_sock(sk);
4864 4949
4865 sp = sctp_sk(sk); 4950 sp = sctp_sk(sk);
4866 ep = sp->ep; 4951 ep = sp->ep;
4867 4952
4868 if (!sctp_style(sk, TCP)) { 4953 if (!sctp_style(sk, TCP)) {
4869 error = -EOPNOTSUPP; 4954 error = -EOPNOTSUPP;
4870 goto out; 4955 goto out;
4871 } 4956 }
4872 4957
4873 if (!sctp_sstate(sk, LISTENING) || !! 4958 if (!sctp_sstate(sk, LISTENING)) {
4874 (sk->sk_shutdown & RCV_SHUTDOWN)) <<
4875 error = -EINVAL; 4959 error = -EINVAL;
4876 goto out; 4960 goto out;
4877 } 4961 }
4878 4962
4879 timeo = sock_rcvtimeo(sk, arg->flags !! 4963 timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
4880 4964
4881 error = sctp_wait_for_accept(sk, time 4965 error = sctp_wait_for_accept(sk, timeo);
4882 if (error) 4966 if (error)
4883 goto out; 4967 goto out;
4884 4968
4885 /* We treat the list of associations 4969 /* We treat the list of associations on the endpoint as the accept
4886 * queue and pick the first associati 4970 * queue and pick the first association on the list.
4887 */ 4971 */
4888 asoc = list_entry(ep->asocs.next, str 4972 asoc = list_entry(ep->asocs.next, struct sctp_association, asocs);
4889 4973
4890 newsk = sp->pf->create_accept_sk(sk, !! 4974 newsk = sp->pf->create_accept_sk(sk, asoc, kern);
4891 if (!newsk) { 4975 if (!newsk) {
4892 error = -ENOMEM; 4976 error = -ENOMEM;
4893 goto out; 4977 goto out;
4894 } 4978 }
4895 4979
4896 /* Populate the fields of the newsk f 4980 /* Populate the fields of the newsk from the oldsk and migrate the
4897 * asoc to the newsk. 4981 * asoc to the newsk.
4898 */ 4982 */
4899 error = sctp_sock_migrate(sk, newsk, 4983 error = sctp_sock_migrate(sk, newsk, asoc, SCTP_SOCKET_TCP);
4900 if (error) { 4984 if (error) {
4901 sk_common_release(newsk); 4985 sk_common_release(newsk);
4902 newsk = NULL; 4986 newsk = NULL;
4903 } 4987 }
4904 4988
4905 out: 4989 out:
4906 release_sock(sk); 4990 release_sock(sk);
4907 arg->err = error; !! 4991 *err = error;
4908 return newsk; 4992 return newsk;
4909 } 4993 }
4910 4994
4911 /* The SCTP ioctl handler. */ 4995 /* The SCTP ioctl handler. */
4912 static int sctp_ioctl(struct sock *sk, int cm !! 4996 static int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
4913 { 4997 {
4914 int rc = -ENOTCONN; 4998 int rc = -ENOTCONN;
4915 4999
4916 lock_sock(sk); 5000 lock_sock(sk);
4917 5001
4918 /* 5002 /*
4919 * SEQPACKET-style sockets in LISTENI 5003 * SEQPACKET-style sockets in LISTENING state are valid, for
4920 * SCTP, so only discard TCP-style so 5004 * SCTP, so only discard TCP-style sockets in LISTENING state.
4921 */ 5005 */
4922 if (sctp_style(sk, TCP) && sctp_sstat 5006 if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
4923 goto out; 5007 goto out;
4924 5008
4925 switch (cmd) { 5009 switch (cmd) {
4926 case SIOCINQ: { 5010 case SIOCINQ: {
4927 struct sk_buff *skb; 5011 struct sk_buff *skb;
4928 *karg = 0; !! 5012 unsigned int amount = 0;
4929 5013
4930 skb = skb_peek(&sk->sk_receiv 5014 skb = skb_peek(&sk->sk_receive_queue);
4931 if (skb != NULL) { 5015 if (skb != NULL) {
4932 /* 5016 /*
4933 * We will only retur 5017 * We will only return the amount of this packet since
4934 * that is all that w 5018 * that is all that will be read.
4935 */ 5019 */
4936 *karg = skb->len; !! 5020 amount = skb->len;
4937 } 5021 }
4938 rc = 0; !! 5022 rc = put_user(amount, (int __user *)arg);
4939 break; 5023 break;
4940 } 5024 }
4941 default: 5025 default:
4942 rc = -ENOIOCTLCMD; 5026 rc = -ENOIOCTLCMD;
4943 break; 5027 break;
4944 } 5028 }
4945 out: 5029 out:
4946 release_sock(sk); 5030 release_sock(sk);
4947 return rc; 5031 return rc;
4948 } 5032 }
4949 5033
4950 /* This is the function which gets called dur 5034 /* This is the function which gets called during socket creation to
4951 * initialized the SCTP-specific portion of t 5035 * initialized the SCTP-specific portion of the sock.
4952 * The sock structure should already be zero- 5036 * The sock structure should already be zero-filled memory.
4953 */ 5037 */
4954 static int sctp_init_sock(struct sock *sk) 5038 static int sctp_init_sock(struct sock *sk)
4955 { 5039 {
4956 struct net *net = sock_net(sk); 5040 struct net *net = sock_net(sk);
4957 struct sctp_sock *sp; 5041 struct sctp_sock *sp;
4958 5042
4959 pr_debug("%s: sk:%p\n", __func__, sk) 5043 pr_debug("%s: sk:%p\n", __func__, sk);
4960 5044
4961 sp = sctp_sk(sk); 5045 sp = sctp_sk(sk);
4962 5046
4963 /* Initialize the SCTP per socket are 5047 /* Initialize the SCTP per socket area. */
4964 switch (sk->sk_type) { 5048 switch (sk->sk_type) {
4965 case SOCK_SEQPACKET: 5049 case SOCK_SEQPACKET:
4966 sp->type = SCTP_SOCKET_UDP; 5050 sp->type = SCTP_SOCKET_UDP;
4967 break; 5051 break;
4968 case SOCK_STREAM: 5052 case SOCK_STREAM:
4969 sp->type = SCTP_SOCKET_TCP; 5053 sp->type = SCTP_SOCKET_TCP;
4970 break; 5054 break;
4971 default: 5055 default:
4972 return -ESOCKTNOSUPPORT; 5056 return -ESOCKTNOSUPPORT;
4973 } 5057 }
4974 5058
4975 sk->sk_gso_type = SKB_GSO_SCTP; 5059 sk->sk_gso_type = SKB_GSO_SCTP;
4976 5060
4977 /* Initialize default send parameters 5061 /* Initialize default send parameters. These parameters can be
4978 * modified with the SCTP_DEFAULT_SEN 5062 * modified with the SCTP_DEFAULT_SEND_PARAM socket option.
4979 */ 5063 */
4980 sp->default_stream = 0; 5064 sp->default_stream = 0;
4981 sp->default_ppid = 0; 5065 sp->default_ppid = 0;
4982 sp->default_flags = 0; 5066 sp->default_flags = 0;
4983 sp->default_context = 0; 5067 sp->default_context = 0;
4984 sp->default_timetolive = 0; 5068 sp->default_timetolive = 0;
4985 5069
4986 sp->default_rcv_context = 0; 5070 sp->default_rcv_context = 0;
4987 sp->max_burst = net->sctp.max_burst; 5071 sp->max_burst = net->sctp.max_burst;
4988 5072
4989 sp->sctp_hmac_alg = net->sctp.sctp_hm 5073 sp->sctp_hmac_alg = net->sctp.sctp_hmac_alg;
4990 5074
4991 /* Initialize default setup parameter 5075 /* Initialize default setup parameters. These parameters
4992 * can be modified with the SCTP_INIT 5076 * can be modified with the SCTP_INITMSG socket option or
4993 * overridden by the SCTP_INIT CMSG. 5077 * overridden by the SCTP_INIT CMSG.
4994 */ 5078 */
4995 sp->initmsg.sinit_num_ostreams = sc 5079 sp->initmsg.sinit_num_ostreams = sctp_max_outstreams;
4996 sp->initmsg.sinit_max_instreams = sc 5080 sp->initmsg.sinit_max_instreams = sctp_max_instreams;
4997 sp->initmsg.sinit_max_attempts = ne 5081 sp->initmsg.sinit_max_attempts = net->sctp.max_retrans_init;
4998 sp->initmsg.sinit_max_init_timeo = ne 5082 sp->initmsg.sinit_max_init_timeo = net->sctp.rto_max;
4999 5083
5000 /* Initialize default RTO related par 5084 /* Initialize default RTO related parameters. These parameters can
5001 * be modified for with the SCTP_RTOI 5085 * be modified for with the SCTP_RTOINFO socket option.
5002 */ 5086 */
5003 sp->rtoinfo.srto_initial = net->sctp. 5087 sp->rtoinfo.srto_initial = net->sctp.rto_initial;
5004 sp->rtoinfo.srto_max = net->sctp. 5088 sp->rtoinfo.srto_max = net->sctp.rto_max;
5005 sp->rtoinfo.srto_min = net->sctp. 5089 sp->rtoinfo.srto_min = net->sctp.rto_min;
5006 5090
5007 /* Initialize default association rel 5091 /* Initialize default association related parameters. These parameters
5008 * can be modified with the SCTP_ASSO 5092 * can be modified with the SCTP_ASSOCINFO socket option.
5009 */ 5093 */
5010 sp->assocparams.sasoc_asocmaxrxt = ne 5094 sp->assocparams.sasoc_asocmaxrxt = net->sctp.max_retrans_association;
5011 sp->assocparams.sasoc_number_peer_des 5095 sp->assocparams.sasoc_number_peer_destinations = 0;
5012 sp->assocparams.sasoc_peer_rwnd = 0; 5096 sp->assocparams.sasoc_peer_rwnd = 0;
5013 sp->assocparams.sasoc_local_rwnd = 0; 5097 sp->assocparams.sasoc_local_rwnd = 0;
5014 sp->assocparams.sasoc_cookie_life = n 5098 sp->assocparams.sasoc_cookie_life = net->sctp.valid_cookie_life;
5015 5099
5016 /* Initialize default event subscript 5100 /* Initialize default event subscriptions. By default, all the
5017 * options are off. 5101 * options are off.
5018 */ 5102 */
5019 sp->subscribe = 0; 5103 sp->subscribe = 0;
5020 5104
5021 /* Default Peer Address Parameters. 5105 /* Default Peer Address Parameters. These defaults can
5022 * be modified via SCTP_PEER_ADDR_PAR 5106 * be modified via SCTP_PEER_ADDR_PARAMS
5023 */ 5107 */
5024 sp->hbinterval = net->sctp.hb_interv 5108 sp->hbinterval = net->sctp.hb_interval;
5025 sp->udp_port = htons(net->sctp.udp <<
5026 sp->encap_port = htons(net->sctp.enc <<
5027 sp->pathmaxrxt = net->sctp.max_retra 5109 sp->pathmaxrxt = net->sctp.max_retrans_path;
5028 sp->pf_retrans = net->sctp.pf_retran 5110 sp->pf_retrans = net->sctp.pf_retrans;
5029 sp->ps_retrans = net->sctp.ps_retran 5111 sp->ps_retrans = net->sctp.ps_retrans;
5030 sp->pf_expose = net->sctp.pf_expose 5112 sp->pf_expose = net->sctp.pf_expose;
5031 sp->pathmtu = 0; /* allow default 5113 sp->pathmtu = 0; /* allow default discovery */
5032 sp->sackdelay = net->sctp.sack_time 5114 sp->sackdelay = net->sctp.sack_timeout;
5033 sp->sackfreq = 2; 5115 sp->sackfreq = 2;
5034 sp->param_flags = SPP_HB_ENABLE | 5116 sp->param_flags = SPP_HB_ENABLE |
5035 SPP_PMTUD_ENABLE | 5117 SPP_PMTUD_ENABLE |
5036 SPP_SACKDELAY_ENABL 5118 SPP_SACKDELAY_ENABLE;
5037 sp->default_ss = SCTP_SS_DEFAULT; 5119 sp->default_ss = SCTP_SS_DEFAULT;
5038 5120
5039 /* If enabled no SCTP message fragmen 5121 /* If enabled no SCTP message fragmentation will be performed.
5040 * Configure through SCTP_DISABLE_FRA 5122 * Configure through SCTP_DISABLE_FRAGMENTS socket option.
5041 */ 5123 */
5042 sp->disable_fragments = 0; 5124 sp->disable_fragments = 0;
5043 5125
5044 /* Enable Nagle algorithm by default. 5126 /* Enable Nagle algorithm by default. */
5045 sp->nodelay = 0; 5127 sp->nodelay = 0;
5046 5128
5047 sp->recvrcvinfo = 0; 5129 sp->recvrcvinfo = 0;
5048 sp->recvnxtinfo = 0; 5130 sp->recvnxtinfo = 0;
5049 5131
5050 /* Enable by default. */ 5132 /* Enable by default. */
5051 sp->v4mapped = 1; 5133 sp->v4mapped = 1;
5052 5134
5053 /* Auto-close idle associations after 5135 /* Auto-close idle associations after the configured
5054 * number of seconds. A value of 0 d 5136 * number of seconds. A value of 0 disables this
5055 * feature. Configure through the SC 5137 * feature. Configure through the SCTP_AUTOCLOSE socket option,
5056 * for UDP-style sockets only. 5138 * for UDP-style sockets only.
5057 */ 5139 */
5058 sp->autoclose = 0; 5140 sp->autoclose = 0;
5059 5141
5060 /* User specified fragmentation limit 5142 /* User specified fragmentation limit. */
5061 sp->user_frag = 0; 5143 sp->user_frag = 0;
5062 5144
5063 sp->adaptation_ind = 0; 5145 sp->adaptation_ind = 0;
5064 5146
5065 sp->pf = sctp_get_pf_specific(sk->sk_ 5147 sp->pf = sctp_get_pf_specific(sk->sk_family);
5066 5148
5067 /* Control variables for partial data 5149 /* Control variables for partial data delivery. */
5068 atomic_set(&sp->pd_mode, 0); 5150 atomic_set(&sp->pd_mode, 0);
5069 skb_queue_head_init(&sp->pd_lobby); 5151 skb_queue_head_init(&sp->pd_lobby);
5070 sp->frag_interleave = 0; 5152 sp->frag_interleave = 0;
5071 sp->probe_interval = net->sctp.probe_ <<
5072 5153
5073 /* Create a per socket endpoint struc 5154 /* Create a per socket endpoint structure. Even if we
5074 * change the data structure relation 5155 * change the data structure relationships, this may still
5075 * be useful for storing pre-connect 5156 * be useful for storing pre-connect address information.
5076 */ 5157 */
5077 sp->ep = sctp_endpoint_new(sk, GFP_KE 5158 sp->ep = sctp_endpoint_new(sk, GFP_KERNEL);
5078 if (!sp->ep) 5159 if (!sp->ep)
5079 return -ENOMEM; 5160 return -ENOMEM;
5080 5161
5081 sp->hmac = NULL; 5162 sp->hmac = NULL;
5082 5163
5083 sk->sk_destruct = sctp_destruct_sock; 5164 sk->sk_destruct = sctp_destruct_sock;
5084 5165
5085 SCTP_DBG_OBJCNT_INC(sock); 5166 SCTP_DBG_OBJCNT_INC(sock);
5086 5167
>> 5168 local_bh_disable();
5087 sk_sockets_allocated_inc(sk); 5169 sk_sockets_allocated_inc(sk);
5088 sock_prot_inuse_add(net, sk->sk_prot, 5170 sock_prot_inuse_add(net, sk->sk_prot, 1);
5089 5171
>> 5172 /* Nothing can fail after this block, otherwise
>> 5173 * sctp_destroy_sock() will be called without addr_wq_lock held
>> 5174 */
>> 5175 if (net->sctp.default_auto_asconf) {
>> 5176 spin_lock(&sock_net(sk)->sctp.addr_wq_lock);
>> 5177 list_add_tail(&sp->auto_asconf_list,
>> 5178 &net->sctp.auto_asconf_splist);
>> 5179 sp->do_auto_asconf = 1;
>> 5180 spin_unlock(&sock_net(sk)->sctp.addr_wq_lock);
>> 5181 } else {
>> 5182 sp->do_auto_asconf = 0;
>> 5183 }
>> 5184
>> 5185 local_bh_enable();
>> 5186
5090 return 0; 5187 return 0;
5091 } 5188 }
5092 5189
5093 /* Cleanup any SCTP per socket resources. Mus 5190 /* Cleanup any SCTP per socket resources. Must be called with
5094 * sock_net(sk)->sctp.addr_wq_lock held if sp 5191 * sock_net(sk)->sctp.addr_wq_lock held if sp->do_auto_asconf is true
5095 */ 5192 */
5096 static void sctp_destroy_sock(struct sock *sk 5193 static void sctp_destroy_sock(struct sock *sk)
5097 { 5194 {
5098 struct sctp_sock *sp; 5195 struct sctp_sock *sp;
5099 5196
5100 pr_debug("%s: sk:%p\n", __func__, sk) 5197 pr_debug("%s: sk:%p\n", __func__, sk);
5101 5198
5102 /* Release our hold on the endpoint. 5199 /* Release our hold on the endpoint. */
5103 sp = sctp_sk(sk); 5200 sp = sctp_sk(sk);
5104 /* This could happen during socket in 5201 /* This could happen during socket init, thus we bail out
5105 * early, since the rest of the below 5202 * early, since the rest of the below is not setup either.
5106 */ 5203 */
5107 if (sp->ep == NULL) 5204 if (sp->ep == NULL)
5108 return; 5205 return;
5109 5206
5110 if (sp->do_auto_asconf) { 5207 if (sp->do_auto_asconf) {
5111 sp->do_auto_asconf = 0; 5208 sp->do_auto_asconf = 0;
5112 list_del(&sp->auto_asconf_lis 5209 list_del(&sp->auto_asconf_list);
5113 } 5210 }
5114 sctp_endpoint_free(sp->ep); 5211 sctp_endpoint_free(sp->ep);
>> 5212 local_bh_disable();
5115 sk_sockets_allocated_dec(sk); 5213 sk_sockets_allocated_dec(sk);
5116 sock_prot_inuse_add(sock_net(sk), sk- 5214 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
>> 5215 local_bh_enable();
5117 } 5216 }
5118 5217
5119 /* Triggered when there are no references on 5218 /* Triggered when there are no references on the socket anymore */
5120 static void sctp_destruct_common(struct sock !! 5219 static void sctp_destruct_sock(struct sock *sk)
5121 { 5220 {
5122 struct sctp_sock *sp = sctp_sk(sk); 5221 struct sctp_sock *sp = sctp_sk(sk);
5123 5222
5124 /* Free up the HMAC transform. */ 5223 /* Free up the HMAC transform. */
5125 crypto_free_shash(sp->hmac); 5224 crypto_free_shash(sp->hmac);
5126 } <<
5127 5225
5128 static void sctp_destruct_sock(struct sock *s <<
5129 { <<
5130 sctp_destruct_common(sk); <<
5131 inet_sock_destruct(sk); 5226 inet_sock_destruct(sk);
5132 } 5227 }
5133 5228
5134 /* API 4.1.7 shutdown() - TCP Style Syntax 5229 /* API 4.1.7 shutdown() - TCP Style Syntax
5135 * int shutdown(int socket, int how); 5230 * int shutdown(int socket, int how);
5136 * 5231 *
5137 * sd - the socket descriptor of the 5232 * sd - the socket descriptor of the association to be closed.
5138 * how - Specifies the type of shutdo 5233 * how - Specifies the type of shutdown. The values are
5139 * as follows: 5234 * as follows:
5140 * SHUT_RD 5235 * SHUT_RD
5141 * Disables further recei 5236 * Disables further receive operations. No SCTP
5142 * protocol action is tak 5237 * protocol action is taken.
5143 * SHUT_WR 5238 * SHUT_WR
5144 * Disables further send 5239 * Disables further send operations, and initiates
5145 * the SCTP shutdown sequ 5240 * the SCTP shutdown sequence.
5146 * SHUT_RDWR 5241 * SHUT_RDWR
5147 * Disables further send 5242 * Disables further send and receive operations
5148 * and initiates the SCTP 5243 * and initiates the SCTP shutdown sequence.
5149 */ 5244 */
5150 static void sctp_shutdown(struct sock *sk, in 5245 static void sctp_shutdown(struct sock *sk, int how)
5151 { 5246 {
5152 struct net *net = sock_net(sk); 5247 struct net *net = sock_net(sk);
5153 struct sctp_endpoint *ep; 5248 struct sctp_endpoint *ep;
5154 5249
5155 if (!sctp_style(sk, TCP)) 5250 if (!sctp_style(sk, TCP))
5156 return; 5251 return;
5157 5252
5158 ep = sctp_sk(sk)->ep; 5253 ep = sctp_sk(sk)->ep;
5159 if (how & SEND_SHUTDOWN && !list_empt 5254 if (how & SEND_SHUTDOWN && !list_empty(&ep->asocs)) {
5160 struct sctp_association *asoc 5255 struct sctp_association *asoc;
5161 5256
5162 inet_sk_set_state(sk, SCTP_SS 5257 inet_sk_set_state(sk, SCTP_SS_CLOSING);
5163 asoc = list_entry(ep->asocs.n 5258 asoc = list_entry(ep->asocs.next,
5164 struct sctp 5259 struct sctp_association, asocs);
5165 sctp_primitive_SHUTDOWN(net, 5260 sctp_primitive_SHUTDOWN(net, asoc, NULL);
5166 } 5261 }
5167 } 5262 }
5168 5263
5169 int sctp_get_sctp_info(struct sock *sk, struc 5264 int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc,
5170 struct sctp_info *info 5265 struct sctp_info *info)
5171 { 5266 {
5172 struct sctp_transport *prim; 5267 struct sctp_transport *prim;
5173 struct list_head *pos; 5268 struct list_head *pos;
5174 int mask; 5269 int mask;
5175 5270
5176 memset(info, 0, sizeof(*info)); 5271 memset(info, 0, sizeof(*info));
5177 if (!asoc) { 5272 if (!asoc) {
5178 struct sctp_sock *sp = sctp_s 5273 struct sctp_sock *sp = sctp_sk(sk);
5179 5274
5180 info->sctpi_s_autoclose = sp- 5275 info->sctpi_s_autoclose = sp->autoclose;
5181 info->sctpi_s_adaptation_ind 5276 info->sctpi_s_adaptation_ind = sp->adaptation_ind;
5182 info->sctpi_s_pd_point = sp-> 5277 info->sctpi_s_pd_point = sp->pd_point;
5183 info->sctpi_s_nodelay = sp->n 5278 info->sctpi_s_nodelay = sp->nodelay;
5184 info->sctpi_s_disable_fragmen 5279 info->sctpi_s_disable_fragments = sp->disable_fragments;
5185 info->sctpi_s_v4mapped = sp-> 5280 info->sctpi_s_v4mapped = sp->v4mapped;
5186 info->sctpi_s_frag_interleave 5281 info->sctpi_s_frag_interleave = sp->frag_interleave;
5187 info->sctpi_s_type = sp->type 5282 info->sctpi_s_type = sp->type;
5188 5283
5189 return 0; 5284 return 0;
5190 } 5285 }
5191 5286
5192 info->sctpi_tag = asoc->c.my_vtag; 5287 info->sctpi_tag = asoc->c.my_vtag;
5193 info->sctpi_state = asoc->state; 5288 info->sctpi_state = asoc->state;
5194 info->sctpi_rwnd = asoc->a_rwnd; 5289 info->sctpi_rwnd = asoc->a_rwnd;
5195 info->sctpi_unackdata = asoc->unack_d 5290 info->sctpi_unackdata = asoc->unack_data;
5196 info->sctpi_penddata = sctp_tsnmap_pe 5291 info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);
5197 info->sctpi_instrms = asoc->stream.in 5292 info->sctpi_instrms = asoc->stream.incnt;
5198 info->sctpi_outstrms = asoc->stream.o 5293 info->sctpi_outstrms = asoc->stream.outcnt;
5199 list_for_each(pos, &asoc->base.inqueu 5294 list_for_each(pos, &asoc->base.inqueue.in_chunk_list)
5200 info->sctpi_inqueue++; 5295 info->sctpi_inqueue++;
5201 list_for_each(pos, &asoc->outqueue.ou 5296 list_for_each(pos, &asoc->outqueue.out_chunk_list)
5202 info->sctpi_outqueue++; 5297 info->sctpi_outqueue++;
5203 info->sctpi_overall_error = asoc->ove 5298 info->sctpi_overall_error = asoc->overall_error_count;
5204 info->sctpi_max_burst = asoc->max_bur 5299 info->sctpi_max_burst = asoc->max_burst;
5205 info->sctpi_maxseg = asoc->frag_point 5300 info->sctpi_maxseg = asoc->frag_point;
5206 info->sctpi_peer_rwnd = asoc->peer.rw 5301 info->sctpi_peer_rwnd = asoc->peer.rwnd;
5207 info->sctpi_peer_tag = asoc->c.peer_v 5302 info->sctpi_peer_tag = asoc->c.peer_vtag;
5208 5303
5209 mask = asoc->peer.intl_capable << 1; !! 5304 mask = asoc->peer.ecn_capable << 1;
5210 mask = (mask | asoc->peer.ecn_capable <<
5211 mask = (mask | asoc->peer.ipv4_addres 5305 mask = (mask | asoc->peer.ipv4_address) << 1;
5212 mask = (mask | asoc->peer.ipv6_addres 5306 mask = (mask | asoc->peer.ipv6_address) << 1;
5213 mask = (mask | asoc->peer.reconf_capa !! 5307 mask = (mask | asoc->peer.hostname_address) << 1;
5214 mask = (mask | asoc->peer.asconf_capa 5308 mask = (mask | asoc->peer.asconf_capable) << 1;
5215 mask = (mask | asoc->peer.prsctp_capa 5309 mask = (mask | asoc->peer.prsctp_capable) << 1;
5216 mask = (mask | asoc->peer.auth_capabl 5310 mask = (mask | asoc->peer.auth_capable);
5217 info->sctpi_peer_capable = mask; 5311 info->sctpi_peer_capable = mask;
5218 mask = asoc->peer.sack_needed << 1; 5312 mask = asoc->peer.sack_needed << 1;
5219 mask = (mask | asoc->peer.sack_genera 5313 mask = (mask | asoc->peer.sack_generation) << 1;
5220 mask = (mask | asoc->peer.zero_window 5314 mask = (mask | asoc->peer.zero_window_announced);
5221 info->sctpi_peer_sack = mask; 5315 info->sctpi_peer_sack = mask;
5222 5316
5223 info->sctpi_isacks = asoc->stats.isac 5317 info->sctpi_isacks = asoc->stats.isacks;
5224 info->sctpi_osacks = asoc->stats.osac 5318 info->sctpi_osacks = asoc->stats.osacks;
5225 info->sctpi_opackets = asoc->stats.op 5319 info->sctpi_opackets = asoc->stats.opackets;
5226 info->sctpi_ipackets = asoc->stats.ip 5320 info->sctpi_ipackets = asoc->stats.ipackets;
5227 info->sctpi_rtxchunks = asoc->stats.r 5321 info->sctpi_rtxchunks = asoc->stats.rtxchunks;
5228 info->sctpi_outofseqtsns = asoc->stat 5322 info->sctpi_outofseqtsns = asoc->stats.outofseqtsns;
5229 info->sctpi_idupchunks = asoc->stats. 5323 info->sctpi_idupchunks = asoc->stats.idupchunks;
5230 info->sctpi_gapcnt = asoc->stats.gapc 5324 info->sctpi_gapcnt = asoc->stats.gapcnt;
5231 info->sctpi_ouodchunks = asoc->stats. 5325 info->sctpi_ouodchunks = asoc->stats.ouodchunks;
5232 info->sctpi_iuodchunks = asoc->stats. 5326 info->sctpi_iuodchunks = asoc->stats.iuodchunks;
5233 info->sctpi_oodchunks = asoc->stats.o 5327 info->sctpi_oodchunks = asoc->stats.oodchunks;
5234 info->sctpi_iodchunks = asoc->stats.i 5328 info->sctpi_iodchunks = asoc->stats.iodchunks;
5235 info->sctpi_octrlchunks = asoc->stats 5329 info->sctpi_octrlchunks = asoc->stats.octrlchunks;
5236 info->sctpi_ictrlchunks = asoc->stats 5330 info->sctpi_ictrlchunks = asoc->stats.ictrlchunks;
5237 5331
5238 prim = asoc->peer.primary_path; 5332 prim = asoc->peer.primary_path;
5239 memcpy(&info->sctpi_p_address, &prim- 5333 memcpy(&info->sctpi_p_address, &prim->ipaddr, sizeof(prim->ipaddr));
5240 info->sctpi_p_state = prim->state; 5334 info->sctpi_p_state = prim->state;
5241 info->sctpi_p_cwnd = prim->cwnd; 5335 info->sctpi_p_cwnd = prim->cwnd;
5242 info->sctpi_p_srtt = prim->srtt; 5336 info->sctpi_p_srtt = prim->srtt;
5243 info->sctpi_p_rto = jiffies_to_msecs( 5337 info->sctpi_p_rto = jiffies_to_msecs(prim->rto);
5244 info->sctpi_p_hbinterval = prim->hbin 5338 info->sctpi_p_hbinterval = prim->hbinterval;
5245 info->sctpi_p_pathmaxrxt = prim->path 5339 info->sctpi_p_pathmaxrxt = prim->pathmaxrxt;
5246 info->sctpi_p_sackdelay = jiffies_to_ 5340 info->sctpi_p_sackdelay = jiffies_to_msecs(prim->sackdelay);
5247 info->sctpi_p_ssthresh = prim->ssthre 5341 info->sctpi_p_ssthresh = prim->ssthresh;
5248 info->sctpi_p_partial_bytes_acked = p 5342 info->sctpi_p_partial_bytes_acked = prim->partial_bytes_acked;
5249 info->sctpi_p_flight_size = prim->fli 5343 info->sctpi_p_flight_size = prim->flight_size;
5250 info->sctpi_p_error = prim->error_cou 5344 info->sctpi_p_error = prim->error_count;
5251 5345
5252 return 0; 5346 return 0;
5253 } 5347 }
5254 EXPORT_SYMBOL_GPL(sctp_get_sctp_info); 5348 EXPORT_SYMBOL_GPL(sctp_get_sctp_info);
5255 5349
5256 /* use callback to avoid exporting the core s 5350 /* use callback to avoid exporting the core structure */
5257 void sctp_transport_walk_start(struct rhashta 5351 void sctp_transport_walk_start(struct rhashtable_iter *iter) __acquires(RCU)
5258 { 5352 {
5259 rhltable_walk_enter(&sctp_transport_h 5353 rhltable_walk_enter(&sctp_transport_hashtable, iter);
5260 5354
5261 rhashtable_walk_start(iter); 5355 rhashtable_walk_start(iter);
5262 } 5356 }
5263 5357
5264 void sctp_transport_walk_stop(struct rhashtab 5358 void sctp_transport_walk_stop(struct rhashtable_iter *iter) __releases(RCU)
5265 { 5359 {
5266 rhashtable_walk_stop(iter); 5360 rhashtable_walk_stop(iter);
5267 rhashtable_walk_exit(iter); 5361 rhashtable_walk_exit(iter);
5268 } 5362 }
5269 5363
5270 struct sctp_transport *sctp_transport_get_nex 5364 struct sctp_transport *sctp_transport_get_next(struct net *net,
5271 5365 struct rhashtable_iter *iter)
5272 { 5366 {
5273 struct sctp_transport *t; 5367 struct sctp_transport *t;
5274 5368
5275 t = rhashtable_walk_next(iter); 5369 t = rhashtable_walk_next(iter);
5276 for (; t; t = rhashtable_walk_next(it 5370 for (; t; t = rhashtable_walk_next(iter)) {
5277 if (IS_ERR(t)) { 5371 if (IS_ERR(t)) {
5278 if (PTR_ERR(t) == -EA 5372 if (PTR_ERR(t) == -EAGAIN)
5279 continue; 5373 continue;
5280 break; 5374 break;
5281 } 5375 }
5282 5376
5283 if (!sctp_transport_hold(t)) 5377 if (!sctp_transport_hold(t))
5284 continue; 5378 continue;
5285 5379
5286 if (net_eq(t->asoc->base.net, 5380 if (net_eq(t->asoc->base.net, net) &&
5287 t->asoc->peer.primary_pat 5381 t->asoc->peer.primary_path == t)
5288 break; 5382 break;
5289 5383
5290 sctp_transport_put(t); 5384 sctp_transport_put(t);
5291 } 5385 }
5292 5386
5293 return t; 5387 return t;
5294 } 5388 }
5295 5389
5296 struct sctp_transport *sctp_transport_get_idx 5390 struct sctp_transport *sctp_transport_get_idx(struct net *net,
5297 5391 struct rhashtable_iter *iter,
5298 5392 int pos)
5299 { 5393 {
5300 struct sctp_transport *t; 5394 struct sctp_transport *t;
5301 5395
5302 if (!pos) 5396 if (!pos)
5303 return SEQ_START_TOKEN; 5397 return SEQ_START_TOKEN;
5304 5398
5305 while ((t = sctp_transport_get_next(n 5399 while ((t = sctp_transport_get_next(net, iter)) && !IS_ERR(t)) {
5306 if (!--pos) 5400 if (!--pos)
5307 break; 5401 break;
5308 sctp_transport_put(t); 5402 sctp_transport_put(t);
5309 } 5403 }
5310 5404
5311 return t; 5405 return t;
5312 } 5406 }
5313 5407
5314 int sctp_for_each_endpoint(int (*cb)(struct s 5408 int sctp_for_each_endpoint(int (*cb)(struct sctp_endpoint *, void *),
5315 void *p) { 5409 void *p) {
5316 int err = 0; 5410 int err = 0;
5317 int hash = 0; 5411 int hash = 0;
5318 struct sctp_endpoint *ep; !! 5412 struct sctp_ep_common *epb;
5319 struct sctp_hashbucket *head; 5413 struct sctp_hashbucket *head;
5320 5414
5321 for (head = sctp_ep_hashtable; hash < 5415 for (head = sctp_ep_hashtable; hash < sctp_ep_hashsize;
5322 hash++, head++) { 5416 hash++, head++) {
5323 read_lock_bh(&head->lock); 5417 read_lock_bh(&head->lock);
5324 sctp_for_each_hentry(ep, &hea !! 5418 sctp_for_each_hentry(epb, &head->chain) {
5325 err = cb(ep, p); !! 5419 err = cb(sctp_ep(epb), p);
5326 if (err) 5420 if (err)
5327 break; 5421 break;
5328 } 5422 }
5329 read_unlock_bh(&head->lock); 5423 read_unlock_bh(&head->lock);
5330 } 5424 }
5331 5425
5332 return err; 5426 return err;
5333 } 5427 }
5334 EXPORT_SYMBOL_GPL(sctp_for_each_endpoint); 5428 EXPORT_SYMBOL_GPL(sctp_for_each_endpoint);
5335 5429
5336 int sctp_transport_lookup_process(sctp_callba !! 5430 int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *),
>> 5431 struct net *net,
5337 const union 5432 const union sctp_addr *laddr,
5338 const union !! 5433 const union sctp_addr *paddr, void *p)
5339 { 5434 {
5340 struct sctp_transport *transport; 5435 struct sctp_transport *transport;
5341 struct sctp_endpoint *ep; !! 5436 int err;
5342 int err = -ENOENT; <<
5343 5437
5344 rcu_read_lock(); 5438 rcu_read_lock();
5345 transport = sctp_addrs_lookup_transpo !! 5439 transport = sctp_addrs_lookup_transport(net, laddr, paddr);
5346 if (!transport) { <<
5347 rcu_read_unlock(); <<
5348 return err; <<
5349 } <<
5350 ep = transport->asoc->ep; <<
5351 if (!sctp_endpoint_hold(ep)) { /* aso <<
5352 sctp_transport_put(transport) <<
5353 rcu_read_unlock(); <<
5354 return err; <<
5355 } <<
5356 rcu_read_unlock(); 5440 rcu_read_unlock();
>> 5441 if (!transport)
>> 5442 return -ENOENT;
5357 5443
5358 err = cb(ep, transport, p); !! 5444 err = cb(transport, p);
5359 sctp_endpoint_put(ep); <<
5360 sctp_transport_put(transport); 5445 sctp_transport_put(transport);
>> 5446
5361 return err; 5447 return err;
5362 } 5448 }
5363 EXPORT_SYMBOL_GPL(sctp_transport_lookup_proce 5449 EXPORT_SYMBOL_GPL(sctp_transport_lookup_process);
5364 5450
5365 int sctp_transport_traverse_process(sctp_call !! 5451 int sctp_for_each_transport(int (*cb)(struct sctp_transport *, void *),
5366 struct ne !! 5452 int (*cb_done)(struct sctp_transport *, void *),
5367 { !! 5453 struct net *net, int *pos, void *p) {
5368 struct rhashtable_iter hti; 5454 struct rhashtable_iter hti;
5369 struct sctp_transport *tsp; 5455 struct sctp_transport *tsp;
5370 struct sctp_endpoint *ep; <<
5371 int ret; 5456 int ret;
5372 5457
5373 again: 5458 again:
5374 ret = 0; 5459 ret = 0;
5375 sctp_transport_walk_start(&hti); 5460 sctp_transport_walk_start(&hti);
5376 5461
5377 tsp = sctp_transport_get_idx(net, &ht 5462 tsp = sctp_transport_get_idx(net, &hti, *pos + 1);
5378 for (; !IS_ERR_OR_NULL(tsp); tsp = sc 5463 for (; !IS_ERR_OR_NULL(tsp); tsp = sctp_transport_get_next(net, &hti)) {
5379 ep = tsp->asoc->ep; !! 5464 ret = cb(tsp, p);
5380 if (sctp_endpoint_hold(ep)) { !! 5465 if (ret)
5381 ret = cb(ep, tsp, p); !! 5466 break;
5382 if (ret) <<
5383 break; <<
5384 sctp_endpoint_put(ep) <<
5385 } <<
5386 (*pos)++; 5467 (*pos)++;
5387 sctp_transport_put(tsp); 5468 sctp_transport_put(tsp);
5388 } 5469 }
5389 sctp_transport_walk_stop(&hti); 5470 sctp_transport_walk_stop(&hti);
5390 5471
5391 if (ret) { 5472 if (ret) {
5392 if (cb_done && !cb_done(ep, t !! 5473 if (cb_done && !cb_done(tsp, p)) {
5393 (*pos)++; 5474 (*pos)++;
5394 sctp_endpoint_put(ep) <<
5395 sctp_transport_put(ts 5475 sctp_transport_put(tsp);
5396 goto again; 5476 goto again;
5397 } 5477 }
5398 sctp_endpoint_put(ep); <<
5399 sctp_transport_put(tsp); 5478 sctp_transport_put(tsp);
5400 } 5479 }
5401 5480
5402 return ret; 5481 return ret;
5403 } 5482 }
5404 EXPORT_SYMBOL_GPL(sctp_transport_traverse_pro !! 5483 EXPORT_SYMBOL_GPL(sctp_for_each_transport);
5405 5484
5406 /* 7.2.1 Association Status (SCTP_STATUS) 5485 /* 7.2.1 Association Status (SCTP_STATUS)
5407 5486
5408 * Applications can retrieve current status i 5487 * Applications can retrieve current status information about an
5409 * association, including association state, 5488 * association, including association state, peer receiver window size,
5410 * number of unacked data chunks, and number 5489 * number of unacked data chunks, and number of data chunks pending
5411 * receipt. This information is read-only. 5490 * receipt. This information is read-only.
5412 */ 5491 */
5413 static int sctp_getsockopt_sctp_status(struct 5492 static int sctp_getsockopt_sctp_status(struct sock *sk, int len,
5414 char _ 5493 char __user *optval,
5415 int __ 5494 int __user *optlen)
5416 { 5495 {
5417 struct sctp_status status; 5496 struct sctp_status status;
5418 struct sctp_association *asoc = NULL; 5497 struct sctp_association *asoc = NULL;
5419 struct sctp_transport *transport; 5498 struct sctp_transport *transport;
5420 sctp_assoc_t associd; 5499 sctp_assoc_t associd;
5421 int retval = 0; 5500 int retval = 0;
5422 5501
5423 if (len < sizeof(status)) { 5502 if (len < sizeof(status)) {
5424 retval = -EINVAL; 5503 retval = -EINVAL;
5425 goto out; 5504 goto out;
5426 } 5505 }
5427 5506
5428 len = sizeof(status); 5507 len = sizeof(status);
5429 if (copy_from_user(&status, optval, l 5508 if (copy_from_user(&status, optval, len)) {
5430 retval = -EFAULT; 5509 retval = -EFAULT;
5431 goto out; 5510 goto out;
5432 } 5511 }
5433 5512
5434 associd = status.sstat_assoc_id; 5513 associd = status.sstat_assoc_id;
5435 asoc = sctp_id2assoc(sk, associd); 5514 asoc = sctp_id2assoc(sk, associd);
5436 if (!asoc) { 5515 if (!asoc) {
5437 retval = -EINVAL; 5516 retval = -EINVAL;
5438 goto out; 5517 goto out;
5439 } 5518 }
5440 5519
5441 transport = asoc->peer.primary_path; 5520 transport = asoc->peer.primary_path;
5442 5521
5443 status.sstat_assoc_id = sctp_assoc2id 5522 status.sstat_assoc_id = sctp_assoc2id(asoc);
5444 status.sstat_state = sctp_assoc_to_st 5523 status.sstat_state = sctp_assoc_to_state(asoc);
5445 status.sstat_rwnd = asoc->peer.rwnd; 5524 status.sstat_rwnd = asoc->peer.rwnd;
5446 status.sstat_unackdata = asoc->unack_ 5525 status.sstat_unackdata = asoc->unack_data;
5447 5526
5448 status.sstat_penddata = sctp_tsnmap_p 5527 status.sstat_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);
5449 status.sstat_instrms = asoc->stream.i 5528 status.sstat_instrms = asoc->stream.incnt;
5450 status.sstat_outstrms = asoc->stream. 5529 status.sstat_outstrms = asoc->stream.outcnt;
5451 status.sstat_fragmentation_point = as 5530 status.sstat_fragmentation_point = asoc->frag_point;
5452 status.sstat_primary.spinfo_assoc_id 5531 status.sstat_primary.spinfo_assoc_id = sctp_assoc2id(transport->asoc);
5453 memcpy(&status.sstat_primary.spinfo_a 5532 memcpy(&status.sstat_primary.spinfo_address, &transport->ipaddr,
5454 transport->af_specifi 5533 transport->af_specific->sockaddr_len);
5455 /* Map ipv4 address into v4-mapped-on 5534 /* Map ipv4 address into v4-mapped-on-v6 address. */
5456 sctp_get_pf_specific(sk->sk_family)-> 5535 sctp_get_pf_specific(sk->sk_family)->addr_to_user(sctp_sk(sk),
5457 (union sctp_addr *)&status.ss 5536 (union sctp_addr *)&status.sstat_primary.spinfo_address);
5458 status.sstat_primary.spinfo_state = t 5537 status.sstat_primary.spinfo_state = transport->state;
5459 status.sstat_primary.spinfo_cwnd = tr 5538 status.sstat_primary.spinfo_cwnd = transport->cwnd;
5460 status.sstat_primary.spinfo_srtt = tr 5539 status.sstat_primary.spinfo_srtt = transport->srtt;
5461 status.sstat_primary.spinfo_rto = jif 5540 status.sstat_primary.spinfo_rto = jiffies_to_msecs(transport->rto);
5462 status.sstat_primary.spinfo_mtu = tra 5541 status.sstat_primary.spinfo_mtu = transport->pathmtu;
5463 5542
5464 if (status.sstat_primary.spinfo_state 5543 if (status.sstat_primary.spinfo_state == SCTP_UNKNOWN)
5465 status.sstat_primary.spinfo_s 5544 status.sstat_primary.spinfo_state = SCTP_ACTIVE;
5466 5545
5467 if (put_user(len, optlen)) { 5546 if (put_user(len, optlen)) {
5468 retval = -EFAULT; 5547 retval = -EFAULT;
5469 goto out; 5548 goto out;
5470 } 5549 }
5471 5550
5472 pr_debug("%s: len:%d, state:%d, rwnd: 5551 pr_debug("%s: len:%d, state:%d, rwnd:%d, assoc_id:%d\n",
5473 __func__, len, status.sstat_ 5552 __func__, len, status.sstat_state, status.sstat_rwnd,
5474 status.sstat_assoc_id); 5553 status.sstat_assoc_id);
5475 5554
5476 if (copy_to_user(optval, &status, len 5555 if (copy_to_user(optval, &status, len)) {
5477 retval = -EFAULT; 5556 retval = -EFAULT;
5478 goto out; 5557 goto out;
5479 } 5558 }
5480 5559
5481 out: 5560 out:
5482 return retval; 5561 return retval;
5483 } 5562 }
5484 5563
5485 5564
5486 /* 7.2.2 Peer Address Information (SCTP_GET_P 5565 /* 7.2.2 Peer Address Information (SCTP_GET_PEER_ADDR_INFO)
5487 * 5566 *
5488 * Applications can retrieve information abou 5567 * Applications can retrieve information about a specific peer address
5489 * of an association, including its reachabil 5568 * of an association, including its reachability state, congestion
5490 * window, and retransmission timer values. 5569 * window, and retransmission timer values. This information is
5491 * read-only. 5570 * read-only.
5492 */ 5571 */
5493 static int sctp_getsockopt_peer_addr_info(str 5572 static int sctp_getsockopt_peer_addr_info(struct sock *sk, int len,
5494 cha 5573 char __user *optval,
5495 int 5574 int __user *optlen)
5496 { 5575 {
5497 struct sctp_paddrinfo pinfo; 5576 struct sctp_paddrinfo pinfo;
5498 struct sctp_transport *transport; 5577 struct sctp_transport *transport;
5499 int retval = 0; 5578 int retval = 0;
5500 5579
5501 if (len < sizeof(pinfo)) { 5580 if (len < sizeof(pinfo)) {
5502 retval = -EINVAL; 5581 retval = -EINVAL;
5503 goto out; 5582 goto out;
5504 } 5583 }
5505 5584
5506 len = sizeof(pinfo); 5585 len = sizeof(pinfo);
5507 if (copy_from_user(&pinfo, optval, le 5586 if (copy_from_user(&pinfo, optval, len)) {
5508 retval = -EFAULT; 5587 retval = -EFAULT;
5509 goto out; 5588 goto out;
5510 } 5589 }
5511 5590
5512 transport = sctp_addr_id2transport(sk 5591 transport = sctp_addr_id2transport(sk, &pinfo.spinfo_address,
5513 pi 5592 pinfo.spinfo_assoc_id);
5514 if (!transport) { 5593 if (!transport) {
5515 retval = -EINVAL; 5594 retval = -EINVAL;
5516 goto out; 5595 goto out;
5517 } 5596 }
5518 5597
5519 if (transport->state == SCTP_PF && 5598 if (transport->state == SCTP_PF &&
5520 transport->asoc->pf_expose == SCT 5599 transport->asoc->pf_expose == SCTP_PF_EXPOSE_DISABLE) {
5521 retval = -EACCES; 5600 retval = -EACCES;
5522 goto out; 5601 goto out;
5523 } 5602 }
5524 5603
5525 pinfo.spinfo_assoc_id = sctp_assoc2id 5604 pinfo.spinfo_assoc_id = sctp_assoc2id(transport->asoc);
5526 pinfo.spinfo_state = transport->state 5605 pinfo.spinfo_state = transport->state;
5527 pinfo.spinfo_cwnd = transport->cwnd; 5606 pinfo.spinfo_cwnd = transport->cwnd;
5528 pinfo.spinfo_srtt = transport->srtt; 5607 pinfo.spinfo_srtt = transport->srtt;
5529 pinfo.spinfo_rto = jiffies_to_msecs(t 5608 pinfo.spinfo_rto = jiffies_to_msecs(transport->rto);
5530 pinfo.spinfo_mtu = transport->pathmtu 5609 pinfo.spinfo_mtu = transport->pathmtu;
5531 5610
5532 if (pinfo.spinfo_state == SCTP_UNKNOW 5611 if (pinfo.spinfo_state == SCTP_UNKNOWN)
5533 pinfo.spinfo_state = SCTP_ACT 5612 pinfo.spinfo_state = SCTP_ACTIVE;
5534 5613
5535 if (put_user(len, optlen)) { 5614 if (put_user(len, optlen)) {
5536 retval = -EFAULT; 5615 retval = -EFAULT;
5537 goto out; 5616 goto out;
5538 } 5617 }
5539 5618
5540 if (copy_to_user(optval, &pinfo, len) 5619 if (copy_to_user(optval, &pinfo, len)) {
5541 retval = -EFAULT; 5620 retval = -EFAULT;
5542 goto out; 5621 goto out;
5543 } 5622 }
5544 5623
5545 out: 5624 out:
5546 return retval; 5625 return retval;
5547 } 5626 }
5548 5627
5549 /* 7.1.12 Enable/Disable message fragmentatio 5628 /* 7.1.12 Enable/Disable message fragmentation (SCTP_DISABLE_FRAGMENTS)
5550 * 5629 *
5551 * This option is a on/off flag. If enabled 5630 * This option is a on/off flag. If enabled no SCTP message
5552 * fragmentation will be performed. Instead 5631 * fragmentation will be performed. Instead if a message being sent
5553 * exceeds the current PMTU size, the message 5632 * exceeds the current PMTU size, the message will NOT be sent and
5554 * instead a error will be indicated to the u 5633 * instead a error will be indicated to the user.
5555 */ 5634 */
5556 static int sctp_getsockopt_disable_fragments( 5635 static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
5557 char 5636 char __user *optval, int __user *optlen)
5558 { 5637 {
5559 int val; 5638 int val;
5560 5639
5561 if (len < sizeof(int)) 5640 if (len < sizeof(int))
5562 return -EINVAL; 5641 return -EINVAL;
5563 5642
5564 len = sizeof(int); 5643 len = sizeof(int);
5565 val = (sctp_sk(sk)->disable_fragments 5644 val = (sctp_sk(sk)->disable_fragments == 1);
5566 if (put_user(len, optlen)) 5645 if (put_user(len, optlen))
5567 return -EFAULT; 5646 return -EFAULT;
5568 if (copy_to_user(optval, &val, len)) 5647 if (copy_to_user(optval, &val, len))
5569 return -EFAULT; 5648 return -EFAULT;
5570 return 0; 5649 return 0;
5571 } 5650 }
5572 5651
5573 /* 7.1.15 Set notification and ancillary even 5652 /* 7.1.15 Set notification and ancillary events (SCTP_EVENTS)
5574 * 5653 *
5575 * This socket option is used to specify vari 5654 * This socket option is used to specify various notifications and
5576 * ancillary data the user wishes to receive. 5655 * ancillary data the user wishes to receive.
5577 */ 5656 */
5578 static int sctp_getsockopt_events(struct sock 5657 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
5579 int __user 5658 int __user *optlen)
5580 { 5659 {
5581 struct sctp_event_subscribe subscribe 5660 struct sctp_event_subscribe subscribe;
5582 __u8 *sn_type = (__u8 *)&subscribe; 5661 __u8 *sn_type = (__u8 *)&subscribe;
5583 int i; 5662 int i;
5584 5663
5585 if (len == 0) 5664 if (len == 0)
5586 return -EINVAL; 5665 return -EINVAL;
5587 if (len > sizeof(struct sctp_event_su 5666 if (len > sizeof(struct sctp_event_subscribe))
5588 len = sizeof(struct sctp_even 5667 len = sizeof(struct sctp_event_subscribe);
5589 if (put_user(len, optlen)) 5668 if (put_user(len, optlen))
5590 return -EFAULT; 5669 return -EFAULT;
5591 5670
5592 for (i = 0; i < len; i++) 5671 for (i = 0; i < len; i++)
5593 sn_type[i] = sctp_ulpevent_ty 5672 sn_type[i] = sctp_ulpevent_type_enabled(sctp_sk(sk)->subscribe,
5594 5673 SCTP_SN_TYPE_BASE + i);
5595 5674
5596 if (copy_to_user(optval, &subscribe, 5675 if (copy_to_user(optval, &subscribe, len))
5597 return -EFAULT; 5676 return -EFAULT;
5598 5677
5599 return 0; 5678 return 0;
5600 } 5679 }
5601 5680
5602 /* 7.1.8 Automatic Close of associations (SCT 5681 /* 7.1.8 Automatic Close of associations (SCTP_AUTOCLOSE)
5603 * 5682 *
5604 * This socket option is applicable to the UD 5683 * This socket option is applicable to the UDP-style socket only. When
5605 * set it will cause associations that are id 5684 * set it will cause associations that are idle for more than the
5606 * specified number of seconds to automatical 5685 * specified number of seconds to automatically close. An association
5607 * being idle is defined an association that 5686 * being idle is defined an association that has NOT sent or received
5608 * user data. The special value of '' indica 5687 * user data. The special value of '' indicates that no automatic
5609 * close of any associations should be perfor 5688 * close of any associations should be performed. The option expects an
5610 * integer defining the number of seconds of 5689 * integer defining the number of seconds of idle time before an
5611 * association is closed. 5690 * association is closed.
5612 */ 5691 */
5613 static int sctp_getsockopt_autoclose(struct s 5692 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
5614 { 5693 {
5615 /* Applicable to UDP-style socket onl 5694 /* Applicable to UDP-style socket only */
5616 if (sctp_style(sk, TCP)) 5695 if (sctp_style(sk, TCP))
5617 return -EOPNOTSUPP; 5696 return -EOPNOTSUPP;
5618 if (len < sizeof(int)) 5697 if (len < sizeof(int))
5619 return -EINVAL; 5698 return -EINVAL;
5620 len = sizeof(int); 5699 len = sizeof(int);
5621 if (put_user(len, optlen)) 5700 if (put_user(len, optlen))
5622 return -EFAULT; 5701 return -EFAULT;
5623 if (put_user(sctp_sk(sk)->autoclose, 5702 if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval))
5624 return -EFAULT; 5703 return -EFAULT;
5625 return 0; 5704 return 0;
5626 } 5705 }
5627 5706
5628 /* Helper routine to branch off an associatio 5707 /* Helper routine to branch off an association to a new socket. */
5629 int sctp_do_peeloff(struct sock *sk, sctp_ass 5708 int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
5630 { 5709 {
5631 struct sctp_association *asoc = sctp_ 5710 struct sctp_association *asoc = sctp_id2assoc(sk, id);
5632 struct sctp_sock *sp = sctp_sk(sk); 5711 struct sctp_sock *sp = sctp_sk(sk);
5633 struct socket *sock; 5712 struct socket *sock;
5634 int err = 0; 5713 int err = 0;
5635 5714
5636 /* Do not peel off from one netns to 5715 /* Do not peel off from one netns to another one. */
5637 if (!net_eq(current->nsproxy->net_ns, 5716 if (!net_eq(current->nsproxy->net_ns, sock_net(sk)))
5638 return -EINVAL; 5717 return -EINVAL;
5639 5718
5640 if (!asoc) 5719 if (!asoc)
5641 return -EINVAL; 5720 return -EINVAL;
5642 5721
5643 /* An association cannot be branched 5722 /* An association cannot be branched off from an already peeled-off
5644 * socket, nor is this supported for 5723 * socket, nor is this supported for tcp style sockets.
5645 */ 5724 */
5646 if (!sctp_style(sk, UDP)) 5725 if (!sctp_style(sk, UDP))
5647 return -EINVAL; 5726 return -EINVAL;
5648 5727
5649 /* Create a new socket. */ 5728 /* Create a new socket. */
5650 err = sock_create(sk->sk_family, SOCK 5729 err = sock_create(sk->sk_family, SOCK_SEQPACKET, IPPROTO_SCTP, &sock);
5651 if (err < 0) 5730 if (err < 0)
5652 return err; 5731 return err;
5653 5732
5654 sctp_copy_sock(sock->sk, sk, asoc); 5733 sctp_copy_sock(sock->sk, sk, asoc);
5655 5734
5656 /* Make peeled-off sockets more like 5735 /* Make peeled-off sockets more like 1-1 accepted sockets.
5657 * Set the daddr and initialize id to 5736 * Set the daddr and initialize id to something more random and also
5658 * copy over any ip options. 5737 * copy over any ip options.
5659 */ 5738 */
5660 sp->pf->to_sk_daddr(&asoc->peer.prima !! 5739 sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sk);
5661 sp->pf->copy_ip_options(sk, sock->sk) 5740 sp->pf->copy_ip_options(sk, sock->sk);
5662 5741
5663 /* Populate the fields of the newsk f 5742 /* Populate the fields of the newsk from the oldsk and migrate the
5664 * asoc to the newsk. 5743 * asoc to the newsk.
5665 */ 5744 */
5666 err = sctp_sock_migrate(sk, sock->sk, 5745 err = sctp_sock_migrate(sk, sock->sk, asoc,
5667 SCTP_SOCKET_U 5746 SCTP_SOCKET_UDP_HIGH_BANDWIDTH);
5668 if (err) { 5747 if (err) {
5669 sock_release(sock); 5748 sock_release(sock);
5670 sock = NULL; 5749 sock = NULL;
5671 } 5750 }
5672 5751
5673 *sockp = sock; 5752 *sockp = sock;
5674 5753
5675 return err; 5754 return err;
5676 } 5755 }
5677 EXPORT_SYMBOL(sctp_do_peeloff); 5756 EXPORT_SYMBOL(sctp_do_peeloff);
5678 5757
5679 static int sctp_getsockopt_peeloff_common(str 5758 static int sctp_getsockopt_peeloff_common(struct sock *sk, sctp_peeloff_arg_t *peeloff,
5680 str 5759 struct file **newfile, unsigned flags)
5681 { 5760 {
5682 struct socket *newsock; 5761 struct socket *newsock;
5683 int retval; 5762 int retval;
5684 5763
5685 retval = sctp_do_peeloff(sk, peeloff- 5764 retval = sctp_do_peeloff(sk, peeloff->associd, &newsock);
5686 if (retval < 0) 5765 if (retval < 0)
5687 goto out; 5766 goto out;
5688 5767
5689 /* Map the socket to an unused fd tha 5768 /* Map the socket to an unused fd that can be returned to the user. */
5690 retval = get_unused_fd_flags(flags & 5769 retval = get_unused_fd_flags(flags & SOCK_CLOEXEC);
5691 if (retval < 0) { 5770 if (retval < 0) {
5692 sock_release(newsock); 5771 sock_release(newsock);
5693 goto out; 5772 goto out;
5694 } 5773 }
5695 5774
5696 *newfile = sock_alloc_file(newsock, 0 5775 *newfile = sock_alloc_file(newsock, 0, NULL);
5697 if (IS_ERR(*newfile)) { 5776 if (IS_ERR(*newfile)) {
5698 put_unused_fd(retval); 5777 put_unused_fd(retval);
5699 retval = PTR_ERR(*newfile); 5778 retval = PTR_ERR(*newfile);
5700 *newfile = NULL; 5779 *newfile = NULL;
5701 return retval; 5780 return retval;
5702 } 5781 }
5703 5782
5704 pr_debug("%s: sk:%p, newsk:%p, sd:%d\ 5783 pr_debug("%s: sk:%p, newsk:%p, sd:%d\n", __func__, sk, newsock->sk,
5705 retval); 5784 retval);
5706 5785
5707 peeloff->sd = retval; 5786 peeloff->sd = retval;
5708 5787
5709 if (flags & SOCK_NONBLOCK) 5788 if (flags & SOCK_NONBLOCK)
5710 (*newfile)->f_flags |= O_NONB 5789 (*newfile)->f_flags |= O_NONBLOCK;
5711 out: 5790 out:
5712 return retval; 5791 return retval;
5713 } 5792 }
5714 5793
5715 static int sctp_getsockopt_peeloff(struct soc 5794 static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
5716 { 5795 {
5717 sctp_peeloff_arg_t peeloff; 5796 sctp_peeloff_arg_t peeloff;
5718 struct file *newfile = NULL; 5797 struct file *newfile = NULL;
5719 int retval = 0; 5798 int retval = 0;
5720 5799
5721 if (len < sizeof(sctp_peeloff_arg_t)) 5800 if (len < sizeof(sctp_peeloff_arg_t))
5722 return -EINVAL; 5801 return -EINVAL;
5723 len = sizeof(sctp_peeloff_arg_t); 5802 len = sizeof(sctp_peeloff_arg_t);
5724 if (copy_from_user(&peeloff, optval, 5803 if (copy_from_user(&peeloff, optval, len))
5725 return -EFAULT; 5804 return -EFAULT;
5726 5805
5727 retval = sctp_getsockopt_peeloff_comm 5806 retval = sctp_getsockopt_peeloff_common(sk, &peeloff, &newfile, 0);
5728 if (retval < 0) 5807 if (retval < 0)
5729 goto out; 5808 goto out;
5730 5809
5731 /* Return the fd mapped to the new so 5810 /* Return the fd mapped to the new socket. */
5732 if (put_user(len, optlen)) { 5811 if (put_user(len, optlen)) {
5733 fput(newfile); 5812 fput(newfile);
5734 put_unused_fd(retval); 5813 put_unused_fd(retval);
5735 return -EFAULT; 5814 return -EFAULT;
5736 } 5815 }
5737 5816
5738 if (copy_to_user(optval, &peeloff, le 5817 if (copy_to_user(optval, &peeloff, len)) {
5739 fput(newfile); 5818 fput(newfile);
5740 put_unused_fd(retval); 5819 put_unused_fd(retval);
5741 return -EFAULT; 5820 return -EFAULT;
5742 } 5821 }
5743 fd_install(retval, newfile); 5822 fd_install(retval, newfile);
5744 out: 5823 out:
5745 return retval; 5824 return retval;
5746 } 5825 }
5747 5826
5748 static int sctp_getsockopt_peeloff_flags(stru 5827 static int sctp_getsockopt_peeloff_flags(struct sock *sk, int len,
5749 char 5828 char __user *optval, int __user *optlen)
5750 { 5829 {
5751 sctp_peeloff_flags_arg_t peeloff; 5830 sctp_peeloff_flags_arg_t peeloff;
5752 struct file *newfile = NULL; 5831 struct file *newfile = NULL;
5753 int retval = 0; 5832 int retval = 0;
5754 5833
5755 if (len < sizeof(sctp_peeloff_flags_a 5834 if (len < sizeof(sctp_peeloff_flags_arg_t))
5756 return -EINVAL; 5835 return -EINVAL;
5757 len = sizeof(sctp_peeloff_flags_arg_t 5836 len = sizeof(sctp_peeloff_flags_arg_t);
5758 if (copy_from_user(&peeloff, optval, 5837 if (copy_from_user(&peeloff, optval, len))
5759 return -EFAULT; 5838 return -EFAULT;
5760 5839
5761 retval = sctp_getsockopt_peeloff_comm 5840 retval = sctp_getsockopt_peeloff_common(sk, &peeloff.p_arg,
5762 5841 &newfile, peeloff.flags);
5763 if (retval < 0) 5842 if (retval < 0)
5764 goto out; 5843 goto out;
5765 5844
5766 /* Return the fd mapped to the new so 5845 /* Return the fd mapped to the new socket. */
5767 if (put_user(len, optlen)) { 5846 if (put_user(len, optlen)) {
5768 fput(newfile); 5847 fput(newfile);
5769 put_unused_fd(retval); 5848 put_unused_fd(retval);
5770 return -EFAULT; 5849 return -EFAULT;
5771 } 5850 }
5772 5851
5773 if (copy_to_user(optval, &peeloff, le 5852 if (copy_to_user(optval, &peeloff, len)) {
5774 fput(newfile); 5853 fput(newfile);
5775 put_unused_fd(retval); 5854 put_unused_fd(retval);
5776 return -EFAULT; 5855 return -EFAULT;
5777 } 5856 }
5778 fd_install(retval, newfile); 5857 fd_install(retval, newfile);
5779 out: 5858 out:
5780 return retval; 5859 return retval;
5781 } 5860 }
5782 5861
5783 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ 5862 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ADDR_PARAMS)
5784 * 5863 *
5785 * Applications can enable or disable heartbe 5864 * Applications can enable or disable heartbeats for any peer address of
5786 * an association, modify an address's heartb 5865 * an association, modify an address's heartbeat interval, force a
5787 * heartbeat to be sent immediately, and adju 5866 * heartbeat to be sent immediately, and adjust the address's maximum
5788 * number of retransmissions sent before an a 5867 * number of retransmissions sent before an address is considered
5789 * unreachable. The following structure is u 5868 * unreachable. The following structure is used to access and modify an
5790 * address's parameters: 5869 * address's parameters:
5791 * 5870 *
5792 * struct sctp_paddrparams { 5871 * struct sctp_paddrparams {
5793 * sctp_assoc_t spp_assoc_id; 5872 * sctp_assoc_t spp_assoc_id;
5794 * struct sockaddr_storage spp_address; 5873 * struct sockaddr_storage spp_address;
5795 * uint32_t spp_hbinterval 5874 * uint32_t spp_hbinterval;
5796 * uint16_t spp_pathmaxrxt 5875 * uint16_t spp_pathmaxrxt;
5797 * uint32_t spp_pathmtu; 5876 * uint32_t spp_pathmtu;
5798 * uint32_t spp_sackdelay; 5877 * uint32_t spp_sackdelay;
5799 * uint32_t spp_flags; 5878 * uint32_t spp_flags;
5800 * }; 5879 * };
5801 * 5880 *
5802 * spp_assoc_id - (one-to-many style soc 5881 * spp_assoc_id - (one-to-many style socket) This is filled in the
5803 * application, and ident 5882 * application, and identifies the association for
5804 * this query. 5883 * this query.
5805 * spp_address - This specifies which a 5884 * spp_address - This specifies which address is of interest.
5806 * spp_hbinterval - This contains the valu 5885 * spp_hbinterval - This contains the value of the heartbeat interval,
5807 * in milliseconds. If a 5886 * in milliseconds. If a value of zero
5808 * is present in this fie 5887 * is present in this field then no changes are to
5809 * be made to this parame 5888 * be made to this parameter.
5810 * spp_pathmaxrxt - This contains the maxi 5889 * spp_pathmaxrxt - This contains the maximum number of
5811 * retransmissions before 5890 * retransmissions before this address shall be
5812 * considered unreachable 5891 * considered unreachable. If a value of zero
5813 * is present in this fie 5892 * is present in this field then no changes are to
5814 * be made to this parame 5893 * be made to this parameter.
5815 * spp_pathmtu - When Path MTU discover 5894 * spp_pathmtu - When Path MTU discovery is disabled the value
5816 * specified here will be 5895 * specified here will be the "fixed" path mtu.
5817 * Note that if the spp_a 5896 * Note that if the spp_address field is empty
5818 * then all associations 5897 * then all associations on this address will
5819 * have this fixed path m 5898 * have this fixed path mtu set upon them.
5820 * 5899 *
5821 * spp_sackdelay - When delayed sack is e 5900 * spp_sackdelay - When delayed sack is enabled, this value specifies
5822 * the number of millisec 5901 * the number of milliseconds that sacks will be delayed
5823 * for. This value will a 5902 * for. This value will apply to all addresses of an
5824 * association if the spp 5903 * association if the spp_address field is empty. Note
5825 * also, that if delayed 5904 * also, that if delayed sack is enabled and this
5826 * value is set to 0, no 5905 * value is set to 0, no change is made to the last
5827 * recorded delayed sack 5906 * recorded delayed sack timer value.
5828 * 5907 *
5829 * spp_flags - These flags are used t 5908 * spp_flags - These flags are used to control various features
5830 * on an association. The 5909 * on an association. The flag field may contain
5831 * zero or more of the fo 5910 * zero or more of the following options.
5832 * 5911 *
5833 * SPP_HB_ENABLE - Enabl 5912 * SPP_HB_ENABLE - Enable heartbeats on the
5834 * specified address. Not 5913 * specified address. Note that if the address
5835 * field is empty all add 5914 * field is empty all addresses for the association
5836 * have heartbeats enable 5915 * have heartbeats enabled upon them.
5837 * 5916 *
5838 * SPP_HB_DISABLE - Disab 5917 * SPP_HB_DISABLE - Disable heartbeats on the
5839 * speicifed address. Not 5918 * speicifed address. Note that if the address
5840 * field is empty all add 5919 * field is empty all addresses for the association
5841 * will have their heartb 5920 * will have their heartbeats disabled. Note also
5842 * that SPP_HB_ENABLE and 5921 * that SPP_HB_ENABLE and SPP_HB_DISABLE are
5843 * mutually exclusive, on 5922 * mutually exclusive, only one of these two should
5844 * be specified. Enabling 5923 * be specified. Enabling both fields will have
5845 * undetermined results. 5924 * undetermined results.
5846 * 5925 *
5847 * SPP_HB_DEMAND - Reques 5926 * SPP_HB_DEMAND - Request a user initiated heartbeat
5848 * to be made immediately 5927 * to be made immediately.
5849 * 5928 *
5850 * SPP_PMTUD_ENABLE - Thi 5929 * SPP_PMTUD_ENABLE - This field will enable PMTU
5851 * discovery upon the spe 5930 * discovery upon the specified address. Note that
5852 * if the address feild i 5931 * if the address feild is empty then all addresses
5853 * on the association are 5932 * on the association are effected.
5854 * 5933 *
5855 * SPP_PMTUD_DISABLE - Th 5934 * SPP_PMTUD_DISABLE - This field will disable PMTU
5856 * discovery upon the spe 5935 * discovery upon the specified address. Note that
5857 * if the address feild i 5936 * if the address feild is empty then all addresses
5858 * on the association are 5937 * on the association are effected. Not also that
5859 * SPP_PMTUD_ENABLE and S 5938 * SPP_PMTUD_ENABLE and SPP_PMTUD_DISABLE are mutually
5860 * exclusive. Enabling bo 5939 * exclusive. Enabling both will have undetermined
5861 * results. 5940 * results.
5862 * 5941 *
5863 * SPP_SACKDELAY_ENABLE - 5942 * SPP_SACKDELAY_ENABLE - Setting this flag turns
5864 * on delayed sack. The t 5943 * on delayed sack. The time specified in spp_sackdelay
5865 * is used to specify the 5944 * is used to specify the sack delay for this address. Note
5866 * that if spp_address is 5945 * that if spp_address is empty then all addresses will
5867 * enable delayed sack an 5946 * enable delayed sack and take on the sack delay
5868 * value specified in spp 5947 * value specified in spp_sackdelay.
5869 * SPP_SACKDELAY_DISABLE 5948 * SPP_SACKDELAY_DISABLE - Setting this flag turns
5870 * off delayed sack. If t 5949 * off delayed sack. If the spp_address field is blank then
5871 * delayed sack is disabl 5950 * delayed sack is disabled for the entire association. Note
5872 * also that this field i 5951 * also that this field is mutually exclusive to
5873 * SPP_SACKDELAY_ENABLE, 5952 * SPP_SACKDELAY_ENABLE, setting both will have undefined
5874 * results. 5953 * results.
5875 * 5954 *
5876 * SPP_IPV6_FLOWLABEL: S 5955 * SPP_IPV6_FLOWLABEL: Setting this flag enables the
5877 * setting of the IPV6 fl 5956 * setting of the IPV6 flow label value. The value is
5878 * contained in the spp_i 5957 * contained in the spp_ipv6_flowlabel field.
5879 * Upon retrieval, this f 5958 * Upon retrieval, this flag will be set to indicate that
5880 * the spp_ipv6_flowlabel 5959 * the spp_ipv6_flowlabel field has a valid value returned.
5881 * If a specific destinat 5960 * If a specific destination address is set (in the
5882 * spp_address field), th 5961 * spp_address field), then the value returned is that of
5883 * the address. If just 5962 * the address. If just an association is specified (and
5884 * no address), then the 5963 * no address), then the association's default flow label
5885 * is returned. If neith 5964 * is returned. If neither an association nor a destination
5886 * is specified, then the 5965 * is specified, then the socket's default flow label is
5887 * returned. For non-IPv 5966 * returned. For non-IPv6 sockets, this flag will be left
5888 * cleared. 5967 * cleared.
5889 * 5968 *
5890 * SPP_DSCP: Setting thi 5969 * SPP_DSCP: Setting this flag enables the setting of the
5891 * Differentiated Service 5970 * Differentiated Services Code Point (DSCP) value
5892 * associated with either 5971 * associated with either the association or a specific
5893 * address. The value is 5972 * address. The value is obtained in the spp_dscp field.
5894 * Upon retrieval, this f 5973 * Upon retrieval, this flag will be set to indicate that
5895 * the spp_dscp field has 5974 * the spp_dscp field has a valid value returned. If a
5896 * specific destination a 5975 * specific destination address is set when called (in the
5897 * spp_address field), th 5976 * spp_address field), then that specific destination
5898 * address's DSCP value i 5977 * address's DSCP value is returned. If just an association
5899 * is specified, then the 5978 * is specified, then the association's default DSCP is
5900 * returned. If neither 5979 * returned. If neither an association nor a destination is
5901 * specified, then the so 5980 * specified, then the socket's default DSCP is returned.
5902 * 5981 *
5903 * spp_ipv6_flowlabel 5982 * spp_ipv6_flowlabel
5904 * - This field is used in 5983 * - This field is used in conjunction with the
5905 * SPP_IPV6_FLOWLABEL fla 5984 * SPP_IPV6_FLOWLABEL flag and contains the IPv6 flow label.
5906 * The 20 least significa 5985 * The 20 least significant bits are used for the flow
5907 * label. This setting h 5986 * label. This setting has precedence over any IPv6-layer
5908 * setting. 5987 * setting.
5909 * 5988 *
5910 * spp_dscp - This field is used in 5989 * spp_dscp - This field is used in conjunction with the SPP_DSCP flag
5911 * and contains the DSCP. 5990 * and contains the DSCP. The 6 most significant bits are
5912 * used for the DSCP. Th 5991 * used for the DSCP. This setting has precedence over any
5913 * IPv4- or IPv6- layer s 5992 * IPv4- or IPv6- layer setting.
5914 */ 5993 */
5915 static int sctp_getsockopt_peer_addr_params(s 5994 static int sctp_getsockopt_peer_addr_params(struct sock *sk, int len,
5916 c 5995 char __user *optval, int __user *optlen)
5917 { 5996 {
5918 struct sctp_paddrparams params; 5997 struct sctp_paddrparams params;
5919 struct sctp_transport *trans = NULL 5998 struct sctp_transport *trans = NULL;
5920 struct sctp_association *asoc = NULL; 5999 struct sctp_association *asoc = NULL;
5921 struct sctp_sock *sp = sctp_sk 6000 struct sctp_sock *sp = sctp_sk(sk);
5922 6001
5923 if (len >= sizeof(params)) 6002 if (len >= sizeof(params))
5924 len = sizeof(params); 6003 len = sizeof(params);
5925 else if (len >= ALIGN(offsetof(struct 6004 else if (len >= ALIGN(offsetof(struct sctp_paddrparams,
5926 spp_ip 6005 spp_ipv6_flowlabel), 4))
5927 len = ALIGN(offsetof(struct s 6006 len = ALIGN(offsetof(struct sctp_paddrparams,
5928 spp_ipv6 6007 spp_ipv6_flowlabel), 4);
5929 else 6008 else
5930 return -EINVAL; 6009 return -EINVAL;
5931 6010
5932 if (copy_from_user(¶ms, optval, l 6011 if (copy_from_user(¶ms, optval, len))
5933 return -EFAULT; 6012 return -EFAULT;
5934 6013
5935 /* If an address other than INADDR_AN 6014 /* If an address other than INADDR_ANY is specified, and
5936 * no transport is found, then the re 6015 * no transport is found, then the request is invalid.
5937 */ 6016 */
5938 if (!sctp_is_any(sk, (union sctp_addr 6017 if (!sctp_is_any(sk, (union sctp_addr *)¶ms.spp_address)) {
5939 trans = sctp_addr_id2transpor 6018 trans = sctp_addr_id2transport(sk, ¶ms.spp_address,
5940 6019 params.spp_assoc_id);
5941 if (!trans) { 6020 if (!trans) {
5942 pr_debug("%s: failed 6021 pr_debug("%s: failed no transport\n", __func__);
5943 return -EINVAL; 6022 return -EINVAL;
5944 } 6023 }
5945 } 6024 }
5946 6025
5947 /* Get association, if assoc_id != SC 6026 /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
5948 * socket is a one to many style sock 6027 * socket is a one to many style socket, and an association
5949 * was not found, then the id was inv 6028 * was not found, then the id was invalid.
5950 */ 6029 */
5951 asoc = sctp_id2assoc(sk, params.spp_a 6030 asoc = sctp_id2assoc(sk, params.spp_assoc_id);
5952 if (!asoc && params.spp_assoc_id != S 6031 if (!asoc && params.spp_assoc_id != SCTP_FUTURE_ASSOC &&
5953 sctp_style(sk, UDP)) { 6032 sctp_style(sk, UDP)) {
5954 pr_debug("%s: failed no assoc 6033 pr_debug("%s: failed no association\n", __func__);
5955 return -EINVAL; 6034 return -EINVAL;
5956 } 6035 }
5957 6036
5958 if (trans) { 6037 if (trans) {
5959 /* Fetch transport values. */ 6038 /* Fetch transport values. */
5960 params.spp_hbinterval = jiffi 6039 params.spp_hbinterval = jiffies_to_msecs(trans->hbinterval);
5961 params.spp_pathmtu = trans 6040 params.spp_pathmtu = trans->pathmtu;
5962 params.spp_pathmaxrxt = trans 6041 params.spp_pathmaxrxt = trans->pathmaxrxt;
5963 params.spp_sackdelay = jiffi 6042 params.spp_sackdelay = jiffies_to_msecs(trans->sackdelay);
5964 6043
5965 /*draft-11 doesn't say what t 6044 /*draft-11 doesn't say what to return in spp_flags*/
5966 params.spp_flags = trans 6045 params.spp_flags = trans->param_flags;
5967 if (trans->flowlabel & SCTP_F 6046 if (trans->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
5968 params.spp_ipv6_flowl 6047 params.spp_ipv6_flowlabel = trans->flowlabel &
5969 6048 SCTP_FLOWLABEL_VAL_MASK;
5970 params.spp_flags |= S 6049 params.spp_flags |= SPP_IPV6_FLOWLABEL;
5971 } 6050 }
5972 if (trans->dscp & SCTP_DSCP_S 6051 if (trans->dscp & SCTP_DSCP_SET_MASK) {
5973 params.spp_dscp = tra 6052 params.spp_dscp = trans->dscp & SCTP_DSCP_VAL_MASK;
5974 params.spp_flags |= S 6053 params.spp_flags |= SPP_DSCP;
5975 } 6054 }
5976 } else if (asoc) { 6055 } else if (asoc) {
5977 /* Fetch association values. 6056 /* Fetch association values. */
5978 params.spp_hbinterval = jiffi 6057 params.spp_hbinterval = jiffies_to_msecs(asoc->hbinterval);
5979 params.spp_pathmtu = asoc- 6058 params.spp_pathmtu = asoc->pathmtu;
5980 params.spp_pathmaxrxt = asoc- 6059 params.spp_pathmaxrxt = asoc->pathmaxrxt;
5981 params.spp_sackdelay = jiffi 6060 params.spp_sackdelay = jiffies_to_msecs(asoc->sackdelay);
5982 6061
5983 /*draft-11 doesn't say what t 6062 /*draft-11 doesn't say what to return in spp_flags*/
5984 params.spp_flags = asoc- 6063 params.spp_flags = asoc->param_flags;
5985 if (asoc->flowlabel & SCTP_FL 6064 if (asoc->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
5986 params.spp_ipv6_flowl 6065 params.spp_ipv6_flowlabel = asoc->flowlabel &
5987 6066 SCTP_FLOWLABEL_VAL_MASK;
5988 params.spp_flags |= S 6067 params.spp_flags |= SPP_IPV6_FLOWLABEL;
5989 } 6068 }
5990 if (asoc->dscp & SCTP_DSCP_SE 6069 if (asoc->dscp & SCTP_DSCP_SET_MASK) {
5991 params.spp_dscp = aso 6070 params.spp_dscp = asoc->dscp & SCTP_DSCP_VAL_MASK;
5992 params.spp_flags |= S 6071 params.spp_flags |= SPP_DSCP;
5993 } 6072 }
5994 } else { 6073 } else {
5995 /* Fetch socket values. */ 6074 /* Fetch socket values. */
5996 params.spp_hbinterval = sp->h 6075 params.spp_hbinterval = sp->hbinterval;
5997 params.spp_pathmtu = sp->p 6076 params.spp_pathmtu = sp->pathmtu;
5998 params.spp_sackdelay = sp->s 6077 params.spp_sackdelay = sp->sackdelay;
5999 params.spp_pathmaxrxt = sp->p 6078 params.spp_pathmaxrxt = sp->pathmaxrxt;
6000 6079
6001 /*draft-11 doesn't say what t 6080 /*draft-11 doesn't say what to return in spp_flags*/
6002 params.spp_flags = sp->p 6081 params.spp_flags = sp->param_flags;
6003 if (sp->flowlabel & SCTP_FLOW 6082 if (sp->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
6004 params.spp_ipv6_flowl 6083 params.spp_ipv6_flowlabel = sp->flowlabel &
6005 6084 SCTP_FLOWLABEL_VAL_MASK;
6006 params.spp_flags |= S 6085 params.spp_flags |= SPP_IPV6_FLOWLABEL;
6007 } 6086 }
6008 if (sp->dscp & SCTP_DSCP_SET_ 6087 if (sp->dscp & SCTP_DSCP_SET_MASK) {
6009 params.spp_dscp = sp- 6088 params.spp_dscp = sp->dscp & SCTP_DSCP_VAL_MASK;
6010 params.spp_flags |= S 6089 params.spp_flags |= SPP_DSCP;
6011 } 6090 }
6012 } 6091 }
6013 6092
6014 if (copy_to_user(optval, ¶ms, len 6093 if (copy_to_user(optval, ¶ms, len))
6015 return -EFAULT; 6094 return -EFAULT;
6016 6095
6017 if (put_user(len, optlen)) 6096 if (put_user(len, optlen))
6018 return -EFAULT; 6097 return -EFAULT;
6019 6098
6020 return 0; 6099 return 0;
6021 } 6100 }
6022 6101
6023 /* 6102 /*
6024 * 7.1.23. Get or set delayed ack timer (SCT 6103 * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK)
6025 * 6104 *
6026 * This option will effect the way delayed ac 6105 * This option will effect the way delayed acks are performed. This
6027 * option allows you to get or set the delaye 6106 * option allows you to get or set the delayed ack time, in
6028 * milliseconds. It also allows changing the 6107 * milliseconds. It also allows changing the delayed ack frequency.
6029 * Changing the frequency to 1 disables the d 6108 * Changing the frequency to 1 disables the delayed sack algorithm. If
6030 * the assoc_id is 0, then this sets or gets 6109 * the assoc_id is 0, then this sets or gets the endpoints default
6031 * values. If the assoc_id field is non-zero 6110 * values. If the assoc_id field is non-zero, then the set or get
6032 * effects the specified association for the 6111 * effects the specified association for the one to many model (the
6033 * assoc_id field is ignored by the one to on 6112 * assoc_id field is ignored by the one to one model). Note that if
6034 * sack_delay or sack_freq are 0 when setting 6113 * sack_delay or sack_freq are 0 when setting this option, then the
6035 * current values will remain unchanged. 6114 * current values will remain unchanged.
6036 * 6115 *
6037 * struct sctp_sack_info { 6116 * struct sctp_sack_info {
6038 * sctp_assoc_t sack_assoc_id; 6117 * sctp_assoc_t sack_assoc_id;
6039 * uint32_t sack_delay; 6118 * uint32_t sack_delay;
6040 * uint32_t sack_freq; 6119 * uint32_t sack_freq;
6041 * }; 6120 * };
6042 * 6121 *
6043 * sack_assoc_id - This parameter, indicates 6122 * sack_assoc_id - This parameter, indicates which association the user
6044 * is performing an action upon. Note tha 6123 * is performing an action upon. Note that if this field's value is
6045 * zero then the endpoints default value i 6124 * zero then the endpoints default value is changed (effecting future
6046 * associations only). 6125 * associations only).
6047 * 6126 *
6048 * sack_delay - This parameter contains the 6127 * sack_delay - This parameter contains the number of milliseconds that
6049 * the user is requesting the delayed ACK 6128 * the user is requesting the delayed ACK timer be set to. Note that
6050 * this value is defined in the standard t 6129 * this value is defined in the standard to be between 200 and 500
6051 * milliseconds. 6130 * milliseconds.
6052 * 6131 *
6053 * sack_freq - This parameter contains the n 6132 * sack_freq - This parameter contains the number of packets that must
6054 * be received before a sack is sent witho 6133 * be received before a sack is sent without waiting for the delay
6055 * timer to expire. The default value for 6134 * timer to expire. The default value for this is 2, setting this
6056 * value to 1 will disable the delayed sac 6135 * value to 1 will disable the delayed sack algorithm.
6057 */ 6136 */
6058 static int sctp_getsockopt_delayed_ack(struct 6137 static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
6059 c 6138 char __user *optval,
6060 i 6139 int __user *optlen)
6061 { 6140 {
6062 struct sctp_sack_info params; 6141 struct sctp_sack_info params;
6063 struct sctp_association *asoc = NULL; 6142 struct sctp_association *asoc = NULL;
6064 struct sctp_sock *sp = sctp_sk 6143 struct sctp_sock *sp = sctp_sk(sk);
6065 6144
6066 if (len >= sizeof(struct sctp_sack_in 6145 if (len >= sizeof(struct sctp_sack_info)) {
6067 len = sizeof(struct sctp_sack 6146 len = sizeof(struct sctp_sack_info);
6068 6147
6069 if (copy_from_user(¶ms, o 6148 if (copy_from_user(¶ms, optval, len))
6070 return -EFAULT; 6149 return -EFAULT;
6071 } else if (len == sizeof(struct sctp_ 6150 } else if (len == sizeof(struct sctp_assoc_value)) {
6072 pr_warn_ratelimited(DEPRECATE 6151 pr_warn_ratelimited(DEPRECATED
6073 "%s (pid 6152 "%s (pid %d) "
6074 "Use of s 6153 "Use of struct sctp_assoc_value in delayed_ack socket option.\n"
6075 "Use stru 6154 "Use struct sctp_sack_info instead\n",
6076 current-> 6155 current->comm, task_pid_nr(current));
6077 if (copy_from_user(¶ms, o 6156 if (copy_from_user(¶ms, optval, len))
6078 return -EFAULT; 6157 return -EFAULT;
6079 } else 6158 } else
6080 return -EINVAL; 6159 return -EINVAL;
6081 6160
6082 /* Get association, if sack_assoc_id 6161 /* Get association, if sack_assoc_id != SCTP_FUTURE_ASSOC and the
6083 * socket is a one to many style sock 6162 * socket is a one to many style socket, and an association
6084 * was not found, then the id was inv 6163 * was not found, then the id was invalid.
6085 */ 6164 */
6086 asoc = sctp_id2assoc(sk, params.sack_ 6165 asoc = sctp_id2assoc(sk, params.sack_assoc_id);
6087 if (!asoc && params.sack_assoc_id != 6166 if (!asoc && params.sack_assoc_id != SCTP_FUTURE_ASSOC &&
6088 sctp_style(sk, UDP)) 6167 sctp_style(sk, UDP))
6089 return -EINVAL; 6168 return -EINVAL;
6090 6169
6091 if (asoc) { 6170 if (asoc) {
6092 /* Fetch association values. 6171 /* Fetch association values. */
6093 if (asoc->param_flags & SPP_S 6172 if (asoc->param_flags & SPP_SACKDELAY_ENABLE) {
6094 params.sack_delay = j 6173 params.sack_delay = jiffies_to_msecs(asoc->sackdelay);
6095 params.sack_freq = as 6174 params.sack_freq = asoc->sackfreq;
6096 6175
6097 } else { 6176 } else {
6098 params.sack_delay = 0 6177 params.sack_delay = 0;
6099 params.sack_freq = 1; 6178 params.sack_freq = 1;
6100 } 6179 }
6101 } else { 6180 } else {
6102 /* Fetch socket values. */ 6181 /* Fetch socket values. */
6103 if (sp->param_flags & SPP_SAC 6182 if (sp->param_flags & SPP_SACKDELAY_ENABLE) {
6104 params.sack_delay = 6183 params.sack_delay = sp->sackdelay;
6105 params.sack_freq = sp 6184 params.sack_freq = sp->sackfreq;
6106 } else { 6185 } else {
6107 params.sack_delay = 6186 params.sack_delay = 0;
6108 params.sack_freq = 1; 6187 params.sack_freq = 1;
6109 } 6188 }
6110 } 6189 }
6111 6190
6112 if (copy_to_user(optval, ¶ms, len 6191 if (copy_to_user(optval, ¶ms, len))
6113 return -EFAULT; 6192 return -EFAULT;
6114 6193
6115 if (put_user(len, optlen)) 6194 if (put_user(len, optlen))
6116 return -EFAULT; 6195 return -EFAULT;
6117 6196
6118 return 0; 6197 return 0;
6119 } 6198 }
6120 6199
6121 /* 7.1.3 Initialization Parameters (SCTP_INIT 6200 /* 7.1.3 Initialization Parameters (SCTP_INITMSG)
6122 * 6201 *
6123 * Applications can specify protocol paramete 6202 * Applications can specify protocol parameters for the default association
6124 * initialization. The option name argument 6203 * initialization. The option name argument to setsockopt() and getsockopt()
6125 * is SCTP_INITMSG. 6204 * is SCTP_INITMSG.
6126 * 6205 *
6127 * Setting initialization parameters is effec 6206 * Setting initialization parameters is effective only on an unconnected
6128 * socket (for UDP-style sockets only future 6207 * socket (for UDP-style sockets only future associations are effected
6129 * by the change). With TCP-style sockets, t 6208 * by the change). With TCP-style sockets, this option is inherited by
6130 * sockets derived from a listener socket. 6209 * sockets derived from a listener socket.
6131 */ 6210 */
6132 static int sctp_getsockopt_initmsg(struct soc 6211 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
6133 { 6212 {
6134 if (len < sizeof(struct sctp_initmsg) 6213 if (len < sizeof(struct sctp_initmsg))
6135 return -EINVAL; 6214 return -EINVAL;
6136 len = sizeof(struct sctp_initmsg); 6215 len = sizeof(struct sctp_initmsg);
6137 if (put_user(len, optlen)) 6216 if (put_user(len, optlen))
6138 return -EFAULT; 6217 return -EFAULT;
6139 if (copy_to_user(optval, &sctp_sk(sk) 6218 if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
6140 return -EFAULT; 6219 return -EFAULT;
6141 return 0; 6220 return 0;
6142 } 6221 }
6143 6222
6144 6223
6145 static int sctp_getsockopt_peer_addrs(struct 6224 static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
6146 char __ 6225 char __user *optval, int __user *optlen)
6147 { 6226 {
6148 struct sctp_association *asoc; 6227 struct sctp_association *asoc;
6149 int cnt = 0; 6228 int cnt = 0;
6150 struct sctp_getaddrs getaddrs; 6229 struct sctp_getaddrs getaddrs;
6151 struct sctp_transport *from; 6230 struct sctp_transport *from;
6152 void __user *to; 6231 void __user *to;
6153 union sctp_addr temp; 6232 union sctp_addr temp;
6154 struct sctp_sock *sp = sctp_sk(sk); 6233 struct sctp_sock *sp = sctp_sk(sk);
6155 int addrlen; 6234 int addrlen;
6156 size_t space_left; 6235 size_t space_left;
6157 int bytes_copied; 6236 int bytes_copied;
6158 6237
6159 if (len < sizeof(struct sctp_getaddrs 6238 if (len < sizeof(struct sctp_getaddrs))
6160 return -EINVAL; 6239 return -EINVAL;
6161 6240
6162 if (copy_from_user(&getaddrs, optval, 6241 if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
6163 return -EFAULT; 6242 return -EFAULT;
6164 6243
6165 /* For UDP-style sockets, id specifie 6244 /* For UDP-style sockets, id specifies the association to query. */
6166 asoc = sctp_id2assoc(sk, getaddrs.ass 6245 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
6167 if (!asoc) 6246 if (!asoc)
6168 return -EINVAL; 6247 return -EINVAL;
6169 6248
6170 to = optval + offsetof(struct sctp_ge 6249 to = optval + offsetof(struct sctp_getaddrs, addrs);
6171 space_left = len - offsetof(struct sc 6250 space_left = len - offsetof(struct sctp_getaddrs, addrs);
6172 6251
6173 list_for_each_entry(from, &asoc->peer 6252 list_for_each_entry(from, &asoc->peer.transport_addr_list,
6174 transports) { 6253 transports) {
6175 memcpy(&temp, &from->ipaddr, 6254 memcpy(&temp, &from->ipaddr, sizeof(temp));
6176 addrlen = sctp_get_pf_specifi 6255 addrlen = sctp_get_pf_specific(sk->sk_family)
6177 ->addr_to_user( 6256 ->addr_to_user(sp, &temp);
6178 if (space_left < addrlen) 6257 if (space_left < addrlen)
6179 return -ENOMEM; 6258 return -ENOMEM;
6180 if (copy_to_user(to, &temp, a 6259 if (copy_to_user(to, &temp, addrlen))
6181 return -EFAULT; 6260 return -EFAULT;
6182 to += addrlen; 6261 to += addrlen;
6183 cnt++; 6262 cnt++;
6184 space_left -= addrlen; 6263 space_left -= addrlen;
6185 } 6264 }
6186 6265
6187 if (put_user(cnt, &((struct sctp_geta 6266 if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
6188 return -EFAULT; 6267 return -EFAULT;
6189 bytes_copied = ((char __user *)to) - 6268 bytes_copied = ((char __user *)to) - optval;
6190 if (put_user(bytes_copied, optlen)) 6269 if (put_user(bytes_copied, optlen))
6191 return -EFAULT; 6270 return -EFAULT;
6192 6271
6193 return 0; 6272 return 0;
6194 } 6273 }
6195 6274
6196 static int sctp_copy_laddrs(struct sock *sk, 6275 static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
6197 size_t space_left 6276 size_t space_left, int *bytes_copied)
6198 { 6277 {
6199 struct sctp_sockaddr_entry *addr; 6278 struct sctp_sockaddr_entry *addr;
6200 union sctp_addr temp; 6279 union sctp_addr temp;
6201 int cnt = 0; 6280 int cnt = 0;
6202 int addrlen; 6281 int addrlen;
6203 struct net *net = sock_net(sk); 6282 struct net *net = sock_net(sk);
6204 6283
6205 rcu_read_lock(); 6284 rcu_read_lock();
6206 list_for_each_entry_rcu(addr, &net->s 6285 list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) {
6207 if (!addr->valid) 6286 if (!addr->valid)
6208 continue; 6287 continue;
6209 6288
6210 if ((PF_INET == sk->sk_family 6289 if ((PF_INET == sk->sk_family) &&
6211 (AF_INET6 == addr->a.sa.s 6290 (AF_INET6 == addr->a.sa.sa_family))
6212 continue; 6291 continue;
6213 if ((PF_INET6 == sk->sk_famil 6292 if ((PF_INET6 == sk->sk_family) &&
6214 inet_v6_ipv6only(sk) && 6293 inet_v6_ipv6only(sk) &&
6215 (AF_INET == addr->a.sa.sa 6294 (AF_INET == addr->a.sa.sa_family))
6216 continue; 6295 continue;
6217 memcpy(&temp, &addr->a, sizeo 6296 memcpy(&temp, &addr->a, sizeof(temp));
6218 if (!temp.v4.sin_port) 6297 if (!temp.v4.sin_port)
6219 temp.v4.sin_port = ht 6298 temp.v4.sin_port = htons(port);
6220 6299
6221 addrlen = sctp_get_pf_specifi 6300 addrlen = sctp_get_pf_specific(sk->sk_family)
6222 ->addr_to_user( 6301 ->addr_to_user(sctp_sk(sk), &temp);
6223 6302
6224 if (space_left < addrlen) { 6303 if (space_left < addrlen) {
6225 cnt = -ENOMEM; 6304 cnt = -ENOMEM;
6226 break; 6305 break;
6227 } 6306 }
6228 memcpy(to, &temp, addrlen); 6307 memcpy(to, &temp, addrlen);
6229 6308
6230 to += addrlen; 6309 to += addrlen;
6231 cnt++; 6310 cnt++;
6232 space_left -= addrlen; 6311 space_left -= addrlen;
6233 *bytes_copied += addrlen; 6312 *bytes_copied += addrlen;
6234 } 6313 }
6235 rcu_read_unlock(); 6314 rcu_read_unlock();
6236 6315
6237 return cnt; 6316 return cnt;
6238 } 6317 }
6239 6318
6240 6319
6241 static int sctp_getsockopt_local_addrs(struct 6320 static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
6242 char _ 6321 char __user *optval, int __user *optlen)
6243 { 6322 {
6244 struct sctp_bind_addr *bp; 6323 struct sctp_bind_addr *bp;
6245 struct sctp_association *asoc; 6324 struct sctp_association *asoc;
6246 int cnt = 0; 6325 int cnt = 0;
6247 struct sctp_getaddrs getaddrs; 6326 struct sctp_getaddrs getaddrs;
6248 struct sctp_sockaddr_entry *addr; 6327 struct sctp_sockaddr_entry *addr;
6249 void __user *to; 6328 void __user *to;
6250 union sctp_addr temp; 6329 union sctp_addr temp;
6251 struct sctp_sock *sp = sctp_sk(sk); 6330 struct sctp_sock *sp = sctp_sk(sk);
6252 int addrlen; 6331 int addrlen;
6253 int err = 0; 6332 int err = 0;
6254 size_t space_left; 6333 size_t space_left;
6255 int bytes_copied = 0; 6334 int bytes_copied = 0;
6256 void *addrs; 6335 void *addrs;
6257 void *buf; 6336 void *buf;
6258 6337
6259 if (len < sizeof(struct sctp_getaddrs 6338 if (len < sizeof(struct sctp_getaddrs))
6260 return -EINVAL; 6339 return -EINVAL;
6261 6340
6262 if (copy_from_user(&getaddrs, optval, 6341 if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
6263 return -EFAULT; 6342 return -EFAULT;
6264 6343
6265 /* 6344 /*
6266 * For UDP-style sockets, id specifi 6345 * For UDP-style sockets, id specifies the association to query.
6267 * If the id field is set to the val 6346 * If the id field is set to the value '' then the locally bound
6268 * addresses are returned without re 6347 * addresses are returned without regard to any particular
6269 * association. 6348 * association.
6270 */ 6349 */
6271 if (0 == getaddrs.assoc_id) { 6350 if (0 == getaddrs.assoc_id) {
6272 bp = &sctp_sk(sk)->ep->base.b 6351 bp = &sctp_sk(sk)->ep->base.bind_addr;
6273 } else { 6352 } else {
6274 asoc = sctp_id2assoc(sk, geta 6353 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
6275 if (!asoc) 6354 if (!asoc)
6276 return -EINVAL; 6355 return -EINVAL;
6277 bp = &asoc->base.bind_addr; 6356 bp = &asoc->base.bind_addr;
6278 } 6357 }
6279 6358
6280 to = optval + offsetof(struct sctp_ge 6359 to = optval + offsetof(struct sctp_getaddrs, addrs);
6281 space_left = len - offsetof(struct sc 6360 space_left = len - offsetof(struct sctp_getaddrs, addrs);
6282 6361
6283 addrs = kmalloc(space_left, GFP_USER 6362 addrs = kmalloc(space_left, GFP_USER | __GFP_NOWARN);
6284 if (!addrs) 6363 if (!addrs)
6285 return -ENOMEM; 6364 return -ENOMEM;
6286 6365
6287 /* If the endpoint is bound to 0.0.0. 6366 /* If the endpoint is bound to 0.0.0.0 or ::0, get the valid
6288 * addresses from the global local ad 6367 * addresses from the global local address list.
6289 */ 6368 */
6290 if (sctp_list_single_entry(&bp->addre 6369 if (sctp_list_single_entry(&bp->address_list)) {
6291 addr = list_entry(bp->address 6370 addr = list_entry(bp->address_list.next,
6292 struct sctp 6371 struct sctp_sockaddr_entry, list);
6293 if (sctp_is_any(sk, &addr->a) 6372 if (sctp_is_any(sk, &addr->a)) {
6294 cnt = sctp_copy_laddr 6373 cnt = sctp_copy_laddrs(sk, bp->port, addrs,
6295 6374 space_left, &bytes_copied);
6296 if (cnt < 0) { 6375 if (cnt < 0) {
6297 err = cnt; 6376 err = cnt;
6298 goto out; 6377 goto out;
6299 } 6378 }
6300 goto copy_getaddrs; 6379 goto copy_getaddrs;
6301 } 6380 }
6302 } 6381 }
6303 6382
6304 buf = addrs; 6383 buf = addrs;
6305 /* Protection on the bound address li 6384 /* Protection on the bound address list is not needed since
6306 * in the socket option context we ho 6385 * in the socket option context we hold a socket lock and
6307 * thus the bound address list can't 6386 * thus the bound address list can't change.
6308 */ 6387 */
6309 list_for_each_entry(addr, &bp->addres 6388 list_for_each_entry(addr, &bp->address_list, list) {
6310 memcpy(&temp, &addr->a, sizeo 6389 memcpy(&temp, &addr->a, sizeof(temp));
6311 addrlen = sctp_get_pf_specifi 6390 addrlen = sctp_get_pf_specific(sk->sk_family)
6312 ->addr_to_user( 6391 ->addr_to_user(sp, &temp);
6313 if (space_left < addrlen) { 6392 if (space_left < addrlen) {
6314 err = -ENOMEM; /*fix 6393 err = -ENOMEM; /*fixme: right error?*/
6315 goto out; 6394 goto out;
6316 } 6395 }
6317 memcpy(buf, &temp, addrlen); 6396 memcpy(buf, &temp, addrlen);
6318 buf += addrlen; 6397 buf += addrlen;
6319 bytes_copied += addrlen; 6398 bytes_copied += addrlen;
6320 cnt++; 6399 cnt++;
6321 space_left -= addrlen; 6400 space_left -= addrlen;
6322 } 6401 }
6323 6402
6324 copy_getaddrs: 6403 copy_getaddrs:
6325 if (copy_to_user(to, addrs, bytes_cop 6404 if (copy_to_user(to, addrs, bytes_copied)) {
6326 err = -EFAULT; 6405 err = -EFAULT;
6327 goto out; 6406 goto out;
6328 } 6407 }
6329 if (put_user(cnt, &((struct sctp_geta 6408 if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) {
6330 err = -EFAULT; 6409 err = -EFAULT;
6331 goto out; 6410 goto out;
6332 } 6411 }
6333 /* XXX: We should have accounted for 6412 /* XXX: We should have accounted for sizeof(struct sctp_getaddrs) too,
6334 * but we can't change it anymore. 6413 * but we can't change it anymore.
6335 */ 6414 */
6336 if (put_user(bytes_copied, optlen)) 6415 if (put_user(bytes_copied, optlen))
6337 err = -EFAULT; 6416 err = -EFAULT;
6338 out: 6417 out:
6339 kfree(addrs); 6418 kfree(addrs);
6340 return err; 6419 return err;
6341 } 6420 }
6342 6421
6343 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_A 6422 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
6344 * 6423 *
6345 * Requests that the local SCTP stack use the 6424 * Requests that the local SCTP stack use the enclosed peer address as
6346 * the association primary. The enclosed add 6425 * the association primary. The enclosed address must be one of the
6347 * association peer's addresses. 6426 * association peer's addresses.
6348 */ 6427 */
6349 static int sctp_getsockopt_primary_addr(struc 6428 static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
6350 char 6429 char __user *optval, int __user *optlen)
6351 { 6430 {
6352 struct sctp_prim prim; 6431 struct sctp_prim prim;
6353 struct sctp_association *asoc; 6432 struct sctp_association *asoc;
6354 struct sctp_sock *sp = sctp_sk(sk); 6433 struct sctp_sock *sp = sctp_sk(sk);
6355 6434
6356 if (len < sizeof(struct sctp_prim)) 6435 if (len < sizeof(struct sctp_prim))
6357 return -EINVAL; 6436 return -EINVAL;
6358 6437
6359 len = sizeof(struct sctp_prim); 6438 len = sizeof(struct sctp_prim);
6360 6439
6361 if (copy_from_user(&prim, optval, len 6440 if (copy_from_user(&prim, optval, len))
6362 return -EFAULT; 6441 return -EFAULT;
6363 6442
6364 asoc = sctp_id2assoc(sk, prim.ssp_ass 6443 asoc = sctp_id2assoc(sk, prim.ssp_assoc_id);
6365 if (!asoc) 6444 if (!asoc)
6366 return -EINVAL; 6445 return -EINVAL;
6367 6446
6368 if (!asoc->peer.primary_path) 6447 if (!asoc->peer.primary_path)
6369 return -ENOTCONN; 6448 return -ENOTCONN;
6370 6449
6371 memcpy(&prim.ssp_addr, &asoc->peer.pr 6450 memcpy(&prim.ssp_addr, &asoc->peer.primary_path->ipaddr,
6372 asoc->peer.primary_path->af_s 6451 asoc->peer.primary_path->af_specific->sockaddr_len);
6373 6452
6374 sctp_get_pf_specific(sk->sk_family)-> 6453 sctp_get_pf_specific(sk->sk_family)->addr_to_user(sp,
6375 (union sctp_addr *)&p 6454 (union sctp_addr *)&prim.ssp_addr);
6376 6455
6377 if (put_user(len, optlen)) 6456 if (put_user(len, optlen))
6378 return -EFAULT; 6457 return -EFAULT;
6379 if (copy_to_user(optval, &prim, len)) 6458 if (copy_to_user(optval, &prim, len))
6380 return -EFAULT; 6459 return -EFAULT;
6381 6460
6382 return 0; 6461 return 0;
6383 } 6462 }
6384 6463
6385 /* 6464 /*
6386 * 7.1.11 Set Adaptation Layer Indicator (SC 6465 * 7.1.11 Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER)
6387 * 6466 *
6388 * Requests that the local endpoint set the s 6467 * Requests that the local endpoint set the specified Adaptation Layer
6389 * Indication parameter for all future INIT a 6468 * Indication parameter for all future INIT and INIT-ACK exchanges.
6390 */ 6469 */
6391 static int sctp_getsockopt_adaptation_layer(s 6470 static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len,
6392 char __user 6471 char __user *optval, int __user *optlen)
6393 { 6472 {
6394 struct sctp_setadaptation adaptation; 6473 struct sctp_setadaptation adaptation;
6395 6474
6396 if (len < sizeof(struct sctp_setadapt 6475 if (len < sizeof(struct sctp_setadaptation))
6397 return -EINVAL; 6476 return -EINVAL;
6398 6477
6399 len = sizeof(struct sctp_setadaptatio 6478 len = sizeof(struct sctp_setadaptation);
6400 6479
6401 adaptation.ssb_adaptation_ind = sctp_ 6480 adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind;
6402 6481
6403 if (put_user(len, optlen)) 6482 if (put_user(len, optlen))
6404 return -EFAULT; 6483 return -EFAULT;
6405 if (copy_to_user(optval, &adaptation, 6484 if (copy_to_user(optval, &adaptation, len))
6406 return -EFAULT; 6485 return -EFAULT;
6407 6486
6408 return 0; 6487 return 0;
6409 } 6488 }
6410 6489
6411 /* 6490 /*
6412 * 6491 *
6413 * 7.1.14 Set default send parameters (SCTP_D 6492 * 7.1.14 Set default send parameters (SCTP_DEFAULT_SEND_PARAM)
6414 * 6493 *
6415 * Applications that wish to use the sendto 6494 * Applications that wish to use the sendto() system call may wish to
6416 * specify a default set of parameters that 6495 * specify a default set of parameters that would normally be supplied
6417 * through the inclusion of ancillary data. 6496 * through the inclusion of ancillary data. This socket option allows
6418 * such an application to set the default s 6497 * such an application to set the default sctp_sndrcvinfo structure.
6419 6498
6420 6499
6421 * The application that wishes to use this 6500 * The application that wishes to use this socket option simply passes
6422 * in to this call the sctp_sndrcvinfo stru 6501 * in to this call the sctp_sndrcvinfo structure defined in Section
6423 * 5.2.2) The input parameters accepted by 6502 * 5.2.2) The input parameters accepted by this call include
6424 * sinfo_stream, sinfo_flags, sinfo_ppid, s 6503 * sinfo_stream, sinfo_flags, sinfo_ppid, sinfo_context,
6425 * sinfo_timetolive. The user must provide 6504 * sinfo_timetolive. The user must provide the sinfo_assoc_id field in
6426 * to this call if the caller is using the 6505 * to this call if the caller is using the UDP model.
6427 * 6506 *
6428 * For getsockopt, it get the default sctp_ 6507 * For getsockopt, it get the default sctp_sndrcvinfo structure.
6429 */ 6508 */
6430 static int sctp_getsockopt_default_send_param 6509 static int sctp_getsockopt_default_send_param(struct sock *sk,
6431 int l 6510 int len, char __user *optval,
6432 int _ 6511 int __user *optlen)
6433 { 6512 {
6434 struct sctp_sock *sp = sctp_sk(sk); 6513 struct sctp_sock *sp = sctp_sk(sk);
6435 struct sctp_association *asoc; 6514 struct sctp_association *asoc;
6436 struct sctp_sndrcvinfo info; 6515 struct sctp_sndrcvinfo info;
6437 6516
6438 if (len < sizeof(info)) 6517 if (len < sizeof(info))
6439 return -EINVAL; 6518 return -EINVAL;
6440 6519
6441 len = sizeof(info); 6520 len = sizeof(info);
6442 6521
6443 if (copy_from_user(&info, optval, len 6522 if (copy_from_user(&info, optval, len))
6444 return -EFAULT; 6523 return -EFAULT;
6445 6524
6446 asoc = sctp_id2assoc(sk, info.sinfo_a 6525 asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
6447 if (!asoc && info.sinfo_assoc_id != S 6526 if (!asoc && info.sinfo_assoc_id != SCTP_FUTURE_ASSOC &&
6448 sctp_style(sk, UDP)) 6527 sctp_style(sk, UDP))
6449 return -EINVAL; 6528 return -EINVAL;
6450 6529
6451 if (asoc) { 6530 if (asoc) {
6452 info.sinfo_stream = asoc->def 6531 info.sinfo_stream = asoc->default_stream;
6453 info.sinfo_flags = asoc->defa 6532 info.sinfo_flags = asoc->default_flags;
6454 info.sinfo_ppid = asoc->defau 6533 info.sinfo_ppid = asoc->default_ppid;
6455 info.sinfo_context = asoc->de 6534 info.sinfo_context = asoc->default_context;
6456 info.sinfo_timetolive = asoc- 6535 info.sinfo_timetolive = asoc->default_timetolive;
6457 } else { 6536 } else {
6458 info.sinfo_stream = sp->defau 6537 info.sinfo_stream = sp->default_stream;
6459 info.sinfo_flags = sp->defaul 6538 info.sinfo_flags = sp->default_flags;
6460 info.sinfo_ppid = sp->default 6539 info.sinfo_ppid = sp->default_ppid;
6461 info.sinfo_context = sp->defa 6540 info.sinfo_context = sp->default_context;
6462 info.sinfo_timetolive = sp->d 6541 info.sinfo_timetolive = sp->default_timetolive;
6463 } 6542 }
6464 6543
6465 if (put_user(len, optlen)) 6544 if (put_user(len, optlen))
6466 return -EFAULT; 6545 return -EFAULT;
6467 if (copy_to_user(optval, &info, len)) 6546 if (copy_to_user(optval, &info, len))
6468 return -EFAULT; 6547 return -EFAULT;
6469 6548
6470 return 0; 6549 return 0;
6471 } 6550 }
6472 6551
6473 /* RFC6458, Section 8.1.31. Set/get Default S 6552 /* RFC6458, Section 8.1.31. Set/get Default Send Parameters
6474 * (SCTP_DEFAULT_SNDINFO) 6553 * (SCTP_DEFAULT_SNDINFO)
6475 */ 6554 */
6476 static int sctp_getsockopt_default_sndinfo(st 6555 static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len,
6477 ch 6556 char __user *optval,
6478 in 6557 int __user *optlen)
6479 { 6558 {
6480 struct sctp_sock *sp = sctp_sk(sk); 6559 struct sctp_sock *sp = sctp_sk(sk);
6481 struct sctp_association *asoc; 6560 struct sctp_association *asoc;
6482 struct sctp_sndinfo info; 6561 struct sctp_sndinfo info;
6483 6562
6484 if (len < sizeof(info)) 6563 if (len < sizeof(info))
6485 return -EINVAL; 6564 return -EINVAL;
6486 6565
6487 len = sizeof(info); 6566 len = sizeof(info);
6488 6567
6489 if (copy_from_user(&info, optval, len 6568 if (copy_from_user(&info, optval, len))
6490 return -EFAULT; 6569 return -EFAULT;
6491 6570
6492 asoc = sctp_id2assoc(sk, info.snd_ass 6571 asoc = sctp_id2assoc(sk, info.snd_assoc_id);
6493 if (!asoc && info.snd_assoc_id != SCT 6572 if (!asoc && info.snd_assoc_id != SCTP_FUTURE_ASSOC &&
6494 sctp_style(sk, UDP)) 6573 sctp_style(sk, UDP))
6495 return -EINVAL; 6574 return -EINVAL;
6496 6575
6497 if (asoc) { 6576 if (asoc) {
6498 info.snd_sid = asoc->default_ 6577 info.snd_sid = asoc->default_stream;
6499 info.snd_flags = asoc->defaul 6578 info.snd_flags = asoc->default_flags;
6500 info.snd_ppid = asoc->default 6579 info.snd_ppid = asoc->default_ppid;
6501 info.snd_context = asoc->defa 6580 info.snd_context = asoc->default_context;
6502 } else { 6581 } else {
6503 info.snd_sid = sp->default_st 6582 info.snd_sid = sp->default_stream;
6504 info.snd_flags = sp->default_ 6583 info.snd_flags = sp->default_flags;
6505 info.snd_ppid = sp->default_p 6584 info.snd_ppid = sp->default_ppid;
6506 info.snd_context = sp->defaul 6585 info.snd_context = sp->default_context;
6507 } 6586 }
6508 6587
6509 if (put_user(len, optlen)) 6588 if (put_user(len, optlen))
6510 return -EFAULT; 6589 return -EFAULT;
6511 if (copy_to_user(optval, &info, len)) 6590 if (copy_to_user(optval, &info, len))
6512 return -EFAULT; 6591 return -EFAULT;
6513 6592
6514 return 0; 6593 return 0;
6515 } 6594 }
6516 6595
6517 /* 6596 /*
6518 * 6597 *
6519 * 7.1.5 SCTP_NODELAY 6598 * 7.1.5 SCTP_NODELAY
6520 * 6599 *
6521 * Turn on/off any Nagle-like algorithm. Thi 6600 * Turn on/off any Nagle-like algorithm. This means that packets are
6522 * generally sent as soon as possible and no 6601 * generally sent as soon as possible and no unnecessary delays are
6523 * introduced, at the cost of more packets in 6602 * introduced, at the cost of more packets in the network. Expects an
6524 * integer boolean flag. 6603 * integer boolean flag.
6525 */ 6604 */
6526 6605
6527 static int sctp_getsockopt_nodelay(struct soc 6606 static int sctp_getsockopt_nodelay(struct sock *sk, int len,
6528 char __use 6607 char __user *optval, int __user *optlen)
6529 { 6608 {
6530 int val; 6609 int val;
6531 6610
6532 if (len < sizeof(int)) 6611 if (len < sizeof(int))
6533 return -EINVAL; 6612 return -EINVAL;
6534 6613
6535 len = sizeof(int); 6614 len = sizeof(int);
6536 val = (sctp_sk(sk)->nodelay == 1); 6615 val = (sctp_sk(sk)->nodelay == 1);
6537 if (put_user(len, optlen)) 6616 if (put_user(len, optlen))
6538 return -EFAULT; 6617 return -EFAULT;
6539 if (copy_to_user(optval, &val, len)) 6618 if (copy_to_user(optval, &val, len))
6540 return -EFAULT; 6619 return -EFAULT;
6541 return 0; 6620 return 0;
6542 } 6621 }
6543 6622
6544 /* 6623 /*
6545 * 6624 *
6546 * 7.1.1 SCTP_RTOINFO 6625 * 7.1.1 SCTP_RTOINFO
6547 * 6626 *
6548 * The protocol parameters used to initialize 6627 * The protocol parameters used to initialize and bound retransmission
6549 * timeout (RTO) are tunable. sctp_rtoinfo st 6628 * timeout (RTO) are tunable. sctp_rtoinfo structure is used to access
6550 * and modify these parameters. 6629 * and modify these parameters.
6551 * All parameters are time values, in millise 6630 * All parameters are time values, in milliseconds. A value of 0, when
6552 * modifying the parameters, indicates that t 6631 * modifying the parameters, indicates that the current value should not
6553 * be changed. 6632 * be changed.
6554 * 6633 *
6555 */ 6634 */
6556 static int sctp_getsockopt_rtoinfo(struct soc 6635 static int sctp_getsockopt_rtoinfo(struct sock *sk, int len,
6557 char __user * 6636 char __user *optval,
6558 int __user *o 6637 int __user *optlen) {
6559 struct sctp_rtoinfo rtoinfo; 6638 struct sctp_rtoinfo rtoinfo;
6560 struct sctp_association *asoc; 6639 struct sctp_association *asoc;
6561 6640
6562 if (len < sizeof (struct sctp_rtoinfo 6641 if (len < sizeof (struct sctp_rtoinfo))
6563 return -EINVAL; 6642 return -EINVAL;
6564 6643
6565 len = sizeof(struct sctp_rtoinfo); 6644 len = sizeof(struct sctp_rtoinfo);
6566 6645
6567 if (copy_from_user(&rtoinfo, optval, 6646 if (copy_from_user(&rtoinfo, optval, len))
6568 return -EFAULT; 6647 return -EFAULT;
6569 6648
6570 asoc = sctp_id2assoc(sk, rtoinfo.srto 6649 asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
6571 6650
6572 if (!asoc && rtoinfo.srto_assoc_id != 6651 if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
6573 sctp_style(sk, UDP)) 6652 sctp_style(sk, UDP))
6574 return -EINVAL; 6653 return -EINVAL;
6575 6654
6576 /* Values corresponding to the specif 6655 /* Values corresponding to the specific association. */
6577 if (asoc) { 6656 if (asoc) {
6578 rtoinfo.srto_initial = jiffie 6657 rtoinfo.srto_initial = jiffies_to_msecs(asoc->rto_initial);
6579 rtoinfo.srto_max = jiffies_to 6658 rtoinfo.srto_max = jiffies_to_msecs(asoc->rto_max);
6580 rtoinfo.srto_min = jiffies_to 6659 rtoinfo.srto_min = jiffies_to_msecs(asoc->rto_min);
6581 } else { 6660 } else {
6582 /* Values corresponding to th 6661 /* Values corresponding to the endpoint. */
6583 struct sctp_sock *sp = sctp_s 6662 struct sctp_sock *sp = sctp_sk(sk);
6584 6663
6585 rtoinfo.srto_initial = sp->rt 6664 rtoinfo.srto_initial = sp->rtoinfo.srto_initial;
6586 rtoinfo.srto_max = sp->rtoinf 6665 rtoinfo.srto_max = sp->rtoinfo.srto_max;
6587 rtoinfo.srto_min = sp->rtoinf 6666 rtoinfo.srto_min = sp->rtoinfo.srto_min;
6588 } 6667 }
6589 6668
6590 if (put_user(len, optlen)) 6669 if (put_user(len, optlen))
6591 return -EFAULT; 6670 return -EFAULT;
6592 6671
6593 if (copy_to_user(optval, &rtoinfo, le 6672 if (copy_to_user(optval, &rtoinfo, len))
6594 return -EFAULT; 6673 return -EFAULT;
6595 6674
6596 return 0; 6675 return 0;
6597 } 6676 }
6598 6677
6599 /* 6678 /*
6600 * 6679 *
6601 * 7.1.2 SCTP_ASSOCINFO 6680 * 7.1.2 SCTP_ASSOCINFO
6602 * 6681 *
6603 * This option is used to tune the maximum re 6682 * This option is used to tune the maximum retransmission attempts
6604 * of the association. 6683 * of the association.
6605 * Returns an error if the new association re 6684 * Returns an error if the new association retransmission value is
6606 * greater than the sum of the retransmission 6685 * greater than the sum of the retransmission value of the peer.
6607 * See [SCTP] for more information. 6686 * See [SCTP] for more information.
6608 * 6687 *
6609 */ 6688 */
6610 static int sctp_getsockopt_associnfo(struct s 6689 static int sctp_getsockopt_associnfo(struct sock *sk, int len,
6611 char __u 6690 char __user *optval,
6612 int __us 6691 int __user *optlen)
6613 { 6692 {
6614 6693
6615 struct sctp_assocparams assocparams; 6694 struct sctp_assocparams assocparams;
6616 struct sctp_association *asoc; 6695 struct sctp_association *asoc;
6617 struct list_head *pos; 6696 struct list_head *pos;
6618 int cnt = 0; 6697 int cnt = 0;
6619 6698
6620 if (len < sizeof (struct sctp_assocpa 6699 if (len < sizeof (struct sctp_assocparams))
6621 return -EINVAL; 6700 return -EINVAL;
6622 6701
6623 len = sizeof(struct sctp_assocparams) 6702 len = sizeof(struct sctp_assocparams);
6624 6703
6625 if (copy_from_user(&assocparams, optv 6704 if (copy_from_user(&assocparams, optval, len))
6626 return -EFAULT; 6705 return -EFAULT;
6627 6706
6628 asoc = sctp_id2assoc(sk, assocparams. 6707 asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
6629 6708
6630 if (!asoc && assocparams.sasoc_assoc_ 6709 if (!asoc && assocparams.sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
6631 sctp_style(sk, UDP)) 6710 sctp_style(sk, UDP))
6632 return -EINVAL; 6711 return -EINVAL;
6633 6712
6634 /* Values correspoinding to the speci 6713 /* Values correspoinding to the specific association */
6635 if (asoc) { 6714 if (asoc) {
6636 assocparams.sasoc_asocmaxrxt 6715 assocparams.sasoc_asocmaxrxt = asoc->max_retrans;
6637 assocparams.sasoc_peer_rwnd = 6716 assocparams.sasoc_peer_rwnd = asoc->peer.rwnd;
6638 assocparams.sasoc_local_rwnd 6717 assocparams.sasoc_local_rwnd = asoc->a_rwnd;
6639 assocparams.sasoc_cookie_life 6718 assocparams.sasoc_cookie_life = ktime_to_ms(asoc->cookie_life);
6640 6719
6641 list_for_each(pos, &asoc->pee 6720 list_for_each(pos, &asoc->peer.transport_addr_list) {
6642 cnt++; 6721 cnt++;
6643 } 6722 }
6644 6723
6645 assocparams.sasoc_number_peer 6724 assocparams.sasoc_number_peer_destinations = cnt;
6646 } else { 6725 } else {
6647 /* Values corresponding to th 6726 /* Values corresponding to the endpoint */
6648 struct sctp_sock *sp = sctp_s 6727 struct sctp_sock *sp = sctp_sk(sk);
6649 6728
6650 assocparams.sasoc_asocmaxrxt 6729 assocparams.sasoc_asocmaxrxt = sp->assocparams.sasoc_asocmaxrxt;
6651 assocparams.sasoc_peer_rwnd = 6730 assocparams.sasoc_peer_rwnd = sp->assocparams.sasoc_peer_rwnd;
6652 assocparams.sasoc_local_rwnd 6731 assocparams.sasoc_local_rwnd = sp->assocparams.sasoc_local_rwnd;
6653 assocparams.sasoc_cookie_life 6732 assocparams.sasoc_cookie_life =
6654 sp->a 6733 sp->assocparams.sasoc_cookie_life;
6655 assocparams.sasoc_number_peer 6734 assocparams.sasoc_number_peer_destinations =
6656 sp->a 6735 sp->assocparams.
6657 sasoc 6736 sasoc_number_peer_destinations;
6658 } 6737 }
6659 6738
6660 if (put_user(len, optlen)) 6739 if (put_user(len, optlen))
6661 return -EFAULT; 6740 return -EFAULT;
6662 6741
6663 if (copy_to_user(optval, &assocparams 6742 if (copy_to_user(optval, &assocparams, len))
6664 return -EFAULT; 6743 return -EFAULT;
6665 6744
6666 return 0; 6745 return 0;
6667 } 6746 }
6668 6747
6669 /* 6748 /*
6670 * 7.1.16 Set/clear IPv4 mapped addresses (SC 6749 * 7.1.16 Set/clear IPv4 mapped addresses (SCTP_I_WANT_MAPPED_V4_ADDR)
6671 * 6750 *
6672 * This socket option is a boolean flag which 6751 * This socket option is a boolean flag which turns on or off mapped V4
6673 * addresses. If this option is turned on an 6752 * addresses. If this option is turned on and the socket is type
6674 * PF_INET6, then IPv4 addresses will be mapp 6753 * PF_INET6, then IPv4 addresses will be mapped to V6 representation.
6675 * If this option is turned off, then no mapp 6754 * If this option is turned off, then no mapping will be done of V4
6676 * addresses and a user will receive both PF_ 6755 * addresses and a user will receive both PF_INET6 and PF_INET type
6677 * addresses on the socket. 6756 * addresses on the socket.
6678 */ 6757 */
6679 static int sctp_getsockopt_mappedv4(struct so 6758 static int sctp_getsockopt_mappedv4(struct sock *sk, int len,
6680 char __us 6759 char __user *optval, int __user *optlen)
6681 { 6760 {
6682 int val; 6761 int val;
6683 struct sctp_sock *sp = sctp_sk(sk); 6762 struct sctp_sock *sp = sctp_sk(sk);
6684 6763
6685 if (len < sizeof(int)) 6764 if (len < sizeof(int))
6686 return -EINVAL; 6765 return -EINVAL;
6687 6766
6688 len = sizeof(int); 6767 len = sizeof(int);
6689 val = sp->v4mapped; 6768 val = sp->v4mapped;
6690 if (put_user(len, optlen)) 6769 if (put_user(len, optlen))
6691 return -EFAULT; 6770 return -EFAULT;
6692 if (copy_to_user(optval, &val, len)) 6771 if (copy_to_user(optval, &val, len))
6693 return -EFAULT; 6772 return -EFAULT;
6694 6773
6695 return 0; 6774 return 0;
6696 } 6775 }
6697 6776
6698 /* 6777 /*
6699 * 7.1.29. Set or Get the default context (S 6778 * 7.1.29. Set or Get the default context (SCTP_CONTEXT)
6700 * (chapter and verse is quoted at sctp_setso 6779 * (chapter and verse is quoted at sctp_setsockopt_context())
6701 */ 6780 */
6702 static int sctp_getsockopt_context(struct soc 6781 static int sctp_getsockopt_context(struct sock *sk, int len,
6703 char __use 6782 char __user *optval, int __user *optlen)
6704 { 6783 {
6705 struct sctp_assoc_value params; 6784 struct sctp_assoc_value params;
6706 struct sctp_association *asoc; 6785 struct sctp_association *asoc;
6707 6786
6708 if (len < sizeof(struct sctp_assoc_va 6787 if (len < sizeof(struct sctp_assoc_value))
6709 return -EINVAL; 6788 return -EINVAL;
6710 6789
6711 len = sizeof(struct sctp_assoc_value) 6790 len = sizeof(struct sctp_assoc_value);
6712 6791
6713 if (copy_from_user(¶ms, optval, l 6792 if (copy_from_user(¶ms, optval, len))
6714 return -EFAULT; 6793 return -EFAULT;
6715 6794
6716 asoc = sctp_id2assoc(sk, params.assoc 6795 asoc = sctp_id2assoc(sk, params.assoc_id);
6717 if (!asoc && params.assoc_id != SCTP_ 6796 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6718 sctp_style(sk, UDP)) 6797 sctp_style(sk, UDP))
6719 return -EINVAL; 6798 return -EINVAL;
6720 6799
6721 params.assoc_value = asoc ? asoc->def 6800 params.assoc_value = asoc ? asoc->default_rcv_context
6722 : sctp_sk(s 6801 : sctp_sk(sk)->default_rcv_context;
6723 6802
6724 if (put_user(len, optlen)) 6803 if (put_user(len, optlen))
6725 return -EFAULT; 6804 return -EFAULT;
6726 if (copy_to_user(optval, ¶ms, len 6805 if (copy_to_user(optval, ¶ms, len))
6727 return -EFAULT; 6806 return -EFAULT;
6728 6807
6729 return 0; 6808 return 0;
6730 } 6809 }
6731 6810
6732 /* 6811 /*
6733 * 8.1.16. Get or Set the Maximum Fragmentat 6812 * 8.1.16. Get or Set the Maximum Fragmentation Size (SCTP_MAXSEG)
6734 * This option will get or set the maximum si 6813 * This option will get or set the maximum size to put in any outgoing
6735 * SCTP DATA chunk. If a message is larger t 6814 * SCTP DATA chunk. If a message is larger than this size it will be
6736 * fragmented by SCTP into the specified size 6815 * fragmented by SCTP into the specified size. Note that the underlying
6737 * SCTP implementation may fragment into smal 6816 * SCTP implementation may fragment into smaller sized chunks when the
6738 * PMTU of the underlying association is smal 6817 * PMTU of the underlying association is smaller than the value set by
6739 * the user. The default value for this opti 6818 * the user. The default value for this option is '' which indicates
6740 * the user is NOT limiting fragmentation and 6819 * the user is NOT limiting fragmentation and only the PMTU will effect
6741 * SCTP's choice of DATA chunk size. Note al 6820 * SCTP's choice of DATA chunk size. Note also that values set larger
6742 * than the maximum size of an IP datagram wi 6821 * than the maximum size of an IP datagram will effectively let SCTP
6743 * control fragmentation (i.e. the same as se 6822 * control fragmentation (i.e. the same as setting this option to 0).
6744 * 6823 *
6745 * The following structure is used to access 6824 * The following structure is used to access and modify this parameter:
6746 * 6825 *
6747 * struct sctp_assoc_value { 6826 * struct sctp_assoc_value {
6748 * sctp_assoc_t assoc_id; 6827 * sctp_assoc_t assoc_id;
6749 * uint32_t assoc_value; 6828 * uint32_t assoc_value;
6750 * }; 6829 * };
6751 * 6830 *
6752 * assoc_id: This parameter is ignored for o 6831 * assoc_id: This parameter is ignored for one-to-one style sockets.
6753 * For one-to-many style sockets this para 6832 * For one-to-many style sockets this parameter indicates which
6754 * association the user is performing an a 6833 * association the user is performing an action upon. Note that if
6755 * this field's value is zero then the end 6834 * this field's value is zero then the endpoints default value is
6756 * changed (effecting future associations 6835 * changed (effecting future associations only).
6757 * assoc_value: This parameter specifies the 6836 * assoc_value: This parameter specifies the maximum size in bytes.
6758 */ 6837 */
6759 static int sctp_getsockopt_maxseg(struct sock 6838 static int sctp_getsockopt_maxseg(struct sock *sk, int len,
6760 char __user 6839 char __user *optval, int __user *optlen)
6761 { 6840 {
6762 struct sctp_assoc_value params; 6841 struct sctp_assoc_value params;
6763 struct sctp_association *asoc; 6842 struct sctp_association *asoc;
6764 6843
6765 if (len == sizeof(int)) { 6844 if (len == sizeof(int)) {
6766 pr_warn_ratelimited(DEPRECATE 6845 pr_warn_ratelimited(DEPRECATED
6767 "%s (pid 6846 "%s (pid %d) "
6768 "Use of i 6847 "Use of int in maxseg socket option.\n"
6769 "Use stru 6848 "Use struct sctp_assoc_value instead\n",
6770 current-> 6849 current->comm, task_pid_nr(current));
6771 params.assoc_id = SCTP_FUTURE 6850 params.assoc_id = SCTP_FUTURE_ASSOC;
6772 } else if (len >= sizeof(struct sctp_ 6851 } else if (len >= sizeof(struct sctp_assoc_value)) {
6773 len = sizeof(struct sctp_asso 6852 len = sizeof(struct sctp_assoc_value);
6774 if (copy_from_user(¶ms, o 6853 if (copy_from_user(¶ms, optval, len))
6775 return -EFAULT; 6854 return -EFAULT;
6776 } else 6855 } else
6777 return -EINVAL; 6856 return -EINVAL;
6778 6857
6779 asoc = sctp_id2assoc(sk, params.assoc 6858 asoc = sctp_id2assoc(sk, params.assoc_id);
6780 if (!asoc && params.assoc_id != SCTP_ 6859 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6781 sctp_style(sk, UDP)) 6860 sctp_style(sk, UDP))
6782 return -EINVAL; 6861 return -EINVAL;
6783 6862
6784 if (asoc) 6863 if (asoc)
6785 params.assoc_value = asoc->fr 6864 params.assoc_value = asoc->frag_point;
6786 else 6865 else
6787 params.assoc_value = sctp_sk( 6866 params.assoc_value = sctp_sk(sk)->user_frag;
6788 6867
6789 if (put_user(len, optlen)) 6868 if (put_user(len, optlen))
6790 return -EFAULT; 6869 return -EFAULT;
6791 if (len == sizeof(int)) { 6870 if (len == sizeof(int)) {
6792 if (copy_to_user(optval, &par 6871 if (copy_to_user(optval, ¶ms.assoc_value, len))
6793 return -EFAULT; 6872 return -EFAULT;
6794 } else { 6873 } else {
6795 if (copy_to_user(optval, &par 6874 if (copy_to_user(optval, ¶ms, len))
6796 return -EFAULT; 6875 return -EFAULT;
6797 } 6876 }
6798 6877
6799 return 0; 6878 return 0;
6800 } 6879 }
6801 6880
6802 /* 6881 /*
6803 * 7.1.24. Get or set fragmented interleave 6882 * 7.1.24. Get or set fragmented interleave (SCTP_FRAGMENT_INTERLEAVE)
6804 * (chapter and verse is quoted at sctp_setso 6883 * (chapter and verse is quoted at sctp_setsockopt_fragment_interleave())
6805 */ 6884 */
6806 static int sctp_getsockopt_fragment_interleav 6885 static int sctp_getsockopt_fragment_interleave(struct sock *sk, int len,
6807 6886 char __user *optval, int __user *optlen)
6808 { 6887 {
6809 int val; 6888 int val;
6810 6889
6811 if (len < sizeof(int)) 6890 if (len < sizeof(int))
6812 return -EINVAL; 6891 return -EINVAL;
6813 6892
6814 len = sizeof(int); 6893 len = sizeof(int);
6815 6894
6816 val = sctp_sk(sk)->frag_interleave; 6895 val = sctp_sk(sk)->frag_interleave;
6817 if (put_user(len, optlen)) 6896 if (put_user(len, optlen))
6818 return -EFAULT; 6897 return -EFAULT;
6819 if (copy_to_user(optval, &val, len)) 6898 if (copy_to_user(optval, &val, len))
6820 return -EFAULT; 6899 return -EFAULT;
6821 6900
6822 return 0; 6901 return 0;
6823 } 6902 }
6824 6903
6825 /* 6904 /*
6826 * 7.1.25. Set or Get the sctp partial deliv 6905 * 7.1.25. Set or Get the sctp partial delivery point
6827 * (chapter and verse is quoted at sctp_setso 6906 * (chapter and verse is quoted at sctp_setsockopt_partial_delivery_point())
6828 */ 6907 */
6829 static int sctp_getsockopt_partial_delivery_p 6908 static int sctp_getsockopt_partial_delivery_point(struct sock *sk, int len,
6830 6909 char __user *optval,
6831 6910 int __user *optlen)
6832 { 6911 {
6833 u32 val; 6912 u32 val;
6834 6913
6835 if (len < sizeof(u32)) 6914 if (len < sizeof(u32))
6836 return -EINVAL; 6915 return -EINVAL;
6837 6916
6838 len = sizeof(u32); 6917 len = sizeof(u32);
6839 6918
6840 val = sctp_sk(sk)->pd_point; 6919 val = sctp_sk(sk)->pd_point;
6841 if (put_user(len, optlen)) 6920 if (put_user(len, optlen))
6842 return -EFAULT; 6921 return -EFAULT;
6843 if (copy_to_user(optval, &val, len)) 6922 if (copy_to_user(optval, &val, len))
6844 return -EFAULT; 6923 return -EFAULT;
6845 6924
6846 return 0; 6925 return 0;
6847 } 6926 }
6848 6927
6849 /* 6928 /*
6850 * 7.1.28. Set or Get the maximum burst (SCT 6929 * 7.1.28. Set or Get the maximum burst (SCTP_MAX_BURST)
6851 * (chapter and verse is quoted at sctp_setso 6930 * (chapter and verse is quoted at sctp_setsockopt_maxburst())
6852 */ 6931 */
6853 static int sctp_getsockopt_maxburst(struct so 6932 static int sctp_getsockopt_maxburst(struct sock *sk, int len,
6854 char __us 6933 char __user *optval,
6855 int __use 6934 int __user *optlen)
6856 { 6935 {
6857 struct sctp_assoc_value params; 6936 struct sctp_assoc_value params;
6858 struct sctp_association *asoc; 6937 struct sctp_association *asoc;
6859 6938
6860 if (len == sizeof(int)) { 6939 if (len == sizeof(int)) {
6861 pr_warn_ratelimited(DEPRECATE 6940 pr_warn_ratelimited(DEPRECATED
6862 "%s (pid 6941 "%s (pid %d) "
6863 "Use of i 6942 "Use of int in max_burst socket option.\n"
6864 "Use stru 6943 "Use struct sctp_assoc_value instead\n",
6865 current-> 6944 current->comm, task_pid_nr(current));
6866 params.assoc_id = SCTP_FUTURE 6945 params.assoc_id = SCTP_FUTURE_ASSOC;
6867 } else if (len >= sizeof(struct sctp_ 6946 } else if (len >= sizeof(struct sctp_assoc_value)) {
6868 len = sizeof(struct sctp_asso 6947 len = sizeof(struct sctp_assoc_value);
6869 if (copy_from_user(¶ms, o 6948 if (copy_from_user(¶ms, optval, len))
6870 return -EFAULT; 6949 return -EFAULT;
6871 } else 6950 } else
6872 return -EINVAL; 6951 return -EINVAL;
6873 6952
6874 asoc = sctp_id2assoc(sk, params.assoc 6953 asoc = sctp_id2assoc(sk, params.assoc_id);
6875 if (!asoc && params.assoc_id != SCTP_ 6954 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6876 sctp_style(sk, UDP)) 6955 sctp_style(sk, UDP))
6877 return -EINVAL; 6956 return -EINVAL;
6878 6957
6879 params.assoc_value = asoc ? asoc->max 6958 params.assoc_value = asoc ? asoc->max_burst : sctp_sk(sk)->max_burst;
6880 6959
6881 if (len == sizeof(int)) { 6960 if (len == sizeof(int)) {
6882 if (copy_to_user(optval, &par 6961 if (copy_to_user(optval, ¶ms.assoc_value, len))
6883 return -EFAULT; 6962 return -EFAULT;
6884 } else { 6963 } else {
6885 if (copy_to_user(optval, &par 6964 if (copy_to_user(optval, ¶ms, len))
6886 return -EFAULT; 6965 return -EFAULT;
6887 } 6966 }
6888 6967
6889 return 0; 6968 return 0;
6890 6969
6891 } 6970 }
6892 6971
6893 static int sctp_getsockopt_hmac_ident(struct 6972 static int sctp_getsockopt_hmac_ident(struct sock *sk, int len,
6894 char __us 6973 char __user *optval, int __user *optlen)
6895 { 6974 {
6896 struct sctp_endpoint *ep = sctp_sk(sk 6975 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
6897 struct sctp_hmacalgo __user *p = (vo 6976 struct sctp_hmacalgo __user *p = (void __user *)optval;
6898 struct sctp_hmac_algo_param *hmacs; 6977 struct sctp_hmac_algo_param *hmacs;
6899 __u16 data_len = 0; 6978 __u16 data_len = 0;
6900 u32 num_idents; 6979 u32 num_idents;
6901 int i; 6980 int i;
6902 6981
6903 if (!ep->auth_enable) 6982 if (!ep->auth_enable)
6904 return -EACCES; 6983 return -EACCES;
6905 6984
6906 hmacs = ep->auth_hmacs_list; 6985 hmacs = ep->auth_hmacs_list;
6907 data_len = ntohs(hmacs->param_hdr.len 6986 data_len = ntohs(hmacs->param_hdr.length) -
6908 sizeof(struct sctp_paramhd 6987 sizeof(struct sctp_paramhdr);
6909 6988
6910 if (len < sizeof(struct sctp_hmacalgo 6989 if (len < sizeof(struct sctp_hmacalgo) + data_len)
6911 return -EINVAL; 6990 return -EINVAL;
6912 6991
6913 len = sizeof(struct sctp_hmacalgo) + 6992 len = sizeof(struct sctp_hmacalgo) + data_len;
6914 num_idents = data_len / sizeof(u16); 6993 num_idents = data_len / sizeof(u16);
6915 6994
6916 if (put_user(len, optlen)) 6995 if (put_user(len, optlen))
6917 return -EFAULT; 6996 return -EFAULT;
6918 if (put_user(num_idents, &p->shmac_nu 6997 if (put_user(num_idents, &p->shmac_num_idents))
6919 return -EFAULT; 6998 return -EFAULT;
6920 for (i = 0; i < num_idents; i++) { 6999 for (i = 0; i < num_idents; i++) {
6921 __u16 hmacid = ntohs(hmacs->h 7000 __u16 hmacid = ntohs(hmacs->hmac_ids[i]);
6922 7001
6923 if (copy_to_user(&p->shmac_id 7002 if (copy_to_user(&p->shmac_idents[i], &hmacid, sizeof(__u16)))
6924 return -EFAULT; 7003 return -EFAULT;
6925 } 7004 }
6926 return 0; 7005 return 0;
6927 } 7006 }
6928 7007
6929 static int sctp_getsockopt_active_key(struct 7008 static int sctp_getsockopt_active_key(struct sock *sk, int len,
6930 char __us 7009 char __user *optval, int __user *optlen)
6931 { 7010 {
6932 struct sctp_endpoint *ep = sctp_sk(sk 7011 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
6933 struct sctp_authkeyid val; 7012 struct sctp_authkeyid val;
6934 struct sctp_association *asoc; 7013 struct sctp_association *asoc;
6935 7014
6936 if (len < sizeof(struct sctp_authkeyi 7015 if (len < sizeof(struct sctp_authkeyid))
6937 return -EINVAL; 7016 return -EINVAL;
6938 7017
6939 len = sizeof(struct sctp_authkeyid); 7018 len = sizeof(struct sctp_authkeyid);
6940 if (copy_from_user(&val, optval, len) 7019 if (copy_from_user(&val, optval, len))
6941 return -EFAULT; 7020 return -EFAULT;
6942 7021
6943 asoc = sctp_id2assoc(sk, val.scact_as 7022 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
6944 if (!asoc && val.scact_assoc_id && sc 7023 if (!asoc && val.scact_assoc_id && sctp_style(sk, UDP))
6945 return -EINVAL; 7024 return -EINVAL;
6946 7025
6947 if (asoc) { 7026 if (asoc) {
6948 if (!asoc->peer.auth_capable) 7027 if (!asoc->peer.auth_capable)
6949 return -EACCES; 7028 return -EACCES;
6950 val.scact_keynumber = asoc->a 7029 val.scact_keynumber = asoc->active_key_id;
6951 } else { 7030 } else {
6952 if (!ep->auth_enable) 7031 if (!ep->auth_enable)
6953 return -EACCES; 7032 return -EACCES;
6954 val.scact_keynumber = ep->act 7033 val.scact_keynumber = ep->active_key_id;
6955 } 7034 }
6956 7035
6957 if (put_user(len, optlen)) 7036 if (put_user(len, optlen))
6958 return -EFAULT; 7037 return -EFAULT;
6959 if (copy_to_user(optval, &val, len)) 7038 if (copy_to_user(optval, &val, len))
6960 return -EFAULT; 7039 return -EFAULT;
6961 7040
6962 return 0; 7041 return 0;
6963 } 7042 }
6964 7043
6965 static int sctp_getsockopt_peer_auth_chunks(s 7044 static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
6966 char __us 7045 char __user *optval, int __user *optlen)
6967 { 7046 {
6968 struct sctp_authchunks __user *p = (v 7047 struct sctp_authchunks __user *p = (void __user *)optval;
6969 struct sctp_authchunks val; 7048 struct sctp_authchunks val;
6970 struct sctp_association *asoc; 7049 struct sctp_association *asoc;
6971 struct sctp_chunks_param *ch; 7050 struct sctp_chunks_param *ch;
6972 u32 num_chunks = 0; 7051 u32 num_chunks = 0;
6973 char __user *to; 7052 char __user *to;
6974 7053
6975 if (len < sizeof(struct sctp_authchun 7054 if (len < sizeof(struct sctp_authchunks))
6976 return -EINVAL; 7055 return -EINVAL;
6977 7056
6978 if (copy_from_user(&val, optval, size 7057 if (copy_from_user(&val, optval, sizeof(val)))
6979 return -EFAULT; 7058 return -EFAULT;
6980 7059
6981 to = p->gauth_chunks; 7060 to = p->gauth_chunks;
6982 asoc = sctp_id2assoc(sk, val.gauth_as 7061 asoc = sctp_id2assoc(sk, val.gauth_assoc_id);
6983 if (!asoc) 7062 if (!asoc)
6984 return -EINVAL; 7063 return -EINVAL;
6985 7064
6986 if (!asoc->peer.auth_capable) 7065 if (!asoc->peer.auth_capable)
6987 return -EACCES; 7066 return -EACCES;
6988 7067
6989 ch = asoc->peer.peer_chunks; 7068 ch = asoc->peer.peer_chunks;
6990 if (!ch) 7069 if (!ch)
6991 goto num; 7070 goto num;
6992 7071
6993 /* See if the user provided enough ro 7072 /* See if the user provided enough room for all the data */
6994 num_chunks = ntohs(ch->param_hdr.leng 7073 num_chunks = ntohs(ch->param_hdr.length) - sizeof(struct sctp_paramhdr);
6995 if (len < num_chunks) 7074 if (len < num_chunks)
6996 return -EINVAL; 7075 return -EINVAL;
6997 7076
6998 if (copy_to_user(to, ch->chunks, num_ 7077 if (copy_to_user(to, ch->chunks, num_chunks))
6999 return -EFAULT; 7078 return -EFAULT;
7000 num: 7079 num:
7001 len = sizeof(struct sctp_authchunks) 7080 len = sizeof(struct sctp_authchunks) + num_chunks;
7002 if (put_user(len, optlen)) 7081 if (put_user(len, optlen))
7003 return -EFAULT; 7082 return -EFAULT;
7004 if (put_user(num_chunks, &p->gauth_nu 7083 if (put_user(num_chunks, &p->gauth_number_of_chunks))
7005 return -EFAULT; 7084 return -EFAULT;
7006 return 0; 7085 return 0;
7007 } 7086 }
7008 7087
7009 static int sctp_getsockopt_local_auth_chunks( 7088 static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
7010 char __us 7089 char __user *optval, int __user *optlen)
7011 { 7090 {
7012 struct sctp_endpoint *ep = sctp_sk(sk 7091 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
7013 struct sctp_authchunks __user *p = (v 7092 struct sctp_authchunks __user *p = (void __user *)optval;
7014 struct sctp_authchunks val; 7093 struct sctp_authchunks val;
7015 struct sctp_association *asoc; 7094 struct sctp_association *asoc;
7016 struct sctp_chunks_param *ch; 7095 struct sctp_chunks_param *ch;
7017 u32 num_chunks = 0; 7096 u32 num_chunks = 0;
7018 char __user *to; 7097 char __user *to;
7019 7098
7020 if (len < sizeof(struct sctp_authchun 7099 if (len < sizeof(struct sctp_authchunks))
7021 return -EINVAL; 7100 return -EINVAL;
7022 7101
7023 if (copy_from_user(&val, optval, size 7102 if (copy_from_user(&val, optval, sizeof(val)))
7024 return -EFAULT; 7103 return -EFAULT;
7025 7104
7026 to = p->gauth_chunks; 7105 to = p->gauth_chunks;
7027 asoc = sctp_id2assoc(sk, val.gauth_as 7106 asoc = sctp_id2assoc(sk, val.gauth_assoc_id);
7028 if (!asoc && val.gauth_assoc_id != SC 7107 if (!asoc && val.gauth_assoc_id != SCTP_FUTURE_ASSOC &&
7029 sctp_style(sk, UDP)) 7108 sctp_style(sk, UDP))
7030 return -EINVAL; 7109 return -EINVAL;
7031 7110
7032 if (asoc) { 7111 if (asoc) {
7033 if (!asoc->peer.auth_capable) 7112 if (!asoc->peer.auth_capable)
7034 return -EACCES; 7113 return -EACCES;
7035 ch = (struct sctp_chunks_para 7114 ch = (struct sctp_chunks_param *)asoc->c.auth_chunks;
7036 } else { 7115 } else {
7037 if (!ep->auth_enable) 7116 if (!ep->auth_enable)
7038 return -EACCES; 7117 return -EACCES;
7039 ch = ep->auth_chunk_list; 7118 ch = ep->auth_chunk_list;
7040 } 7119 }
7041 if (!ch) 7120 if (!ch)
7042 goto num; 7121 goto num;
7043 7122
7044 num_chunks = ntohs(ch->param_hdr.leng 7123 num_chunks = ntohs(ch->param_hdr.length) - sizeof(struct sctp_paramhdr);
7045 if (len < sizeof(struct sctp_authchun 7124 if (len < sizeof(struct sctp_authchunks) + num_chunks)
7046 return -EINVAL; 7125 return -EINVAL;
7047 7126
7048 if (copy_to_user(to, ch->chunks, num_ 7127 if (copy_to_user(to, ch->chunks, num_chunks))
7049 return -EFAULT; 7128 return -EFAULT;
7050 num: 7129 num:
7051 len = sizeof(struct sctp_authchunks) 7130 len = sizeof(struct sctp_authchunks) + num_chunks;
7052 if (put_user(len, optlen)) 7131 if (put_user(len, optlen))
7053 return -EFAULT; 7132 return -EFAULT;
7054 if (put_user(num_chunks, &p->gauth_nu 7133 if (put_user(num_chunks, &p->gauth_number_of_chunks))
7055 return -EFAULT; 7134 return -EFAULT;
7056 7135
7057 return 0; 7136 return 0;
7058 } 7137 }
7059 7138
7060 /* 7139 /*
7061 * 8.2.5. Get the Current Number of Associat 7140 * 8.2.5. Get the Current Number of Associations (SCTP_GET_ASSOC_NUMBER)
7062 * This option gets the current number of ass 7141 * This option gets the current number of associations that are attached
7063 * to a one-to-many style socket. The option 7142 * to a one-to-many style socket. The option value is an uint32_t.
7064 */ 7143 */
7065 static int sctp_getsockopt_assoc_number(struc 7144 static int sctp_getsockopt_assoc_number(struct sock *sk, int len,
7066 char __us 7145 char __user *optval, int __user *optlen)
7067 { 7146 {
7068 struct sctp_sock *sp = sctp_sk(sk); 7147 struct sctp_sock *sp = sctp_sk(sk);
7069 struct sctp_association *asoc; 7148 struct sctp_association *asoc;
7070 u32 val = 0; 7149 u32 val = 0;
7071 7150
7072 if (sctp_style(sk, TCP)) 7151 if (sctp_style(sk, TCP))
7073 return -EOPNOTSUPP; 7152 return -EOPNOTSUPP;
7074 7153
7075 if (len < sizeof(u32)) 7154 if (len < sizeof(u32))
7076 return -EINVAL; 7155 return -EINVAL;
7077 7156
7078 len = sizeof(u32); 7157 len = sizeof(u32);
7079 7158
7080 list_for_each_entry(asoc, &(sp->ep->a 7159 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7081 val++; 7160 val++;
7082 } 7161 }
7083 7162
7084 if (put_user(len, optlen)) 7163 if (put_user(len, optlen))
7085 return -EFAULT; 7164 return -EFAULT;
7086 if (copy_to_user(optval, &val, len)) 7165 if (copy_to_user(optval, &val, len))
7087 return -EFAULT; 7166 return -EFAULT;
7088 7167
7089 return 0; 7168 return 0;
7090 } 7169 }
7091 7170
7092 /* 7171 /*
7093 * 8.1.23 SCTP_AUTO_ASCONF 7172 * 8.1.23 SCTP_AUTO_ASCONF
7094 * See the corresponding setsockopt entry as 7173 * See the corresponding setsockopt entry as description
7095 */ 7174 */
7096 static int sctp_getsockopt_auto_asconf(struct 7175 static int sctp_getsockopt_auto_asconf(struct sock *sk, int len,
7097 char __use 7176 char __user *optval, int __user *optlen)
7098 { 7177 {
7099 int val = 0; 7178 int val = 0;
7100 7179
7101 if (len < sizeof(int)) 7180 if (len < sizeof(int))
7102 return -EINVAL; 7181 return -EINVAL;
7103 7182
7104 len = sizeof(int); 7183 len = sizeof(int);
7105 if (sctp_sk(sk)->do_auto_asconf && sc 7184 if (sctp_sk(sk)->do_auto_asconf && sctp_is_ep_boundall(sk))
7106 val = 1; 7185 val = 1;
7107 if (put_user(len, optlen)) 7186 if (put_user(len, optlen))
7108 return -EFAULT; 7187 return -EFAULT;
7109 if (copy_to_user(optval, &val, len)) 7188 if (copy_to_user(optval, &val, len))
7110 return -EFAULT; 7189 return -EFAULT;
7111 return 0; 7190 return 0;
7112 } 7191 }
7113 7192
7114 /* 7193 /*
7115 * 8.2.6. Get the Current Identifiers of Asso 7194 * 8.2.6. Get the Current Identifiers of Associations
7116 * (SCTP_GET_ASSOC_ID_LIST) 7195 * (SCTP_GET_ASSOC_ID_LIST)
7117 * 7196 *
7118 * This option gets the current list of SCTP 7197 * This option gets the current list of SCTP association identifiers of
7119 * the SCTP associations handled by a one-to- 7198 * the SCTP associations handled by a one-to-many style socket.
7120 */ 7199 */
7121 static int sctp_getsockopt_assoc_ids(struct s 7200 static int sctp_getsockopt_assoc_ids(struct sock *sk, int len,
7122 char __us 7201 char __user *optval, int __user *optlen)
7123 { 7202 {
7124 struct sctp_sock *sp = sctp_sk(sk); 7203 struct sctp_sock *sp = sctp_sk(sk);
7125 struct sctp_association *asoc; 7204 struct sctp_association *asoc;
7126 struct sctp_assoc_ids *ids; 7205 struct sctp_assoc_ids *ids;
7127 size_t ids_size; <<
7128 u32 num = 0; 7206 u32 num = 0;
7129 7207
7130 if (sctp_style(sk, TCP)) 7208 if (sctp_style(sk, TCP))
7131 return -EOPNOTSUPP; 7209 return -EOPNOTSUPP;
7132 7210
7133 if (len < sizeof(struct sctp_assoc_id 7211 if (len < sizeof(struct sctp_assoc_ids))
7134 return -EINVAL; 7212 return -EINVAL;
7135 7213
7136 list_for_each_entry(asoc, &(sp->ep->a 7214 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7137 num++; 7215 num++;
7138 } 7216 }
7139 7217
7140 ids_size = struct_size(ids, gaids_ass !! 7218 if (len < sizeof(struct sctp_assoc_ids) + sizeof(sctp_assoc_t) * num)
7141 if (len < ids_size) <<
7142 return -EINVAL; 7219 return -EINVAL;
7143 7220
7144 len = ids_size; !! 7221 len = sizeof(struct sctp_assoc_ids) + sizeof(sctp_assoc_t) * num;
>> 7222
7145 ids = kmalloc(len, GFP_USER | __GFP_N 7223 ids = kmalloc(len, GFP_USER | __GFP_NOWARN);
7146 if (unlikely(!ids)) 7224 if (unlikely(!ids))
7147 return -ENOMEM; 7225 return -ENOMEM;
7148 7226
7149 ids->gaids_number_of_ids = num; 7227 ids->gaids_number_of_ids = num;
7150 num = 0; 7228 num = 0;
7151 list_for_each_entry(asoc, &(sp->ep->a 7229 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7152 ids->gaids_assoc_id[num++] = 7230 ids->gaids_assoc_id[num++] = asoc->assoc_id;
7153 } 7231 }
7154 7232
7155 if (put_user(len, optlen) || copy_to_ 7233 if (put_user(len, optlen) || copy_to_user(optval, ids, len)) {
7156 kfree(ids); 7234 kfree(ids);
7157 return -EFAULT; 7235 return -EFAULT;
7158 } 7236 }
7159 7237
7160 kfree(ids); 7238 kfree(ids);
7161 return 0; 7239 return 0;
7162 } 7240 }
7163 7241
7164 /* 7242 /*
7165 * SCTP_PEER_ADDR_THLDS 7243 * SCTP_PEER_ADDR_THLDS
7166 * 7244 *
7167 * This option allows us to fetch the partial 7245 * This option allows us to fetch the partially failed threshold for one or all
7168 * transports in an association. See Section 7246 * transports in an association. See Section 6.1 of:
7169 * http://www.ietf.org/id/draft-nishida-tsvwg 7247 * http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
7170 */ 7248 */
7171 static int sctp_getsockopt_paddr_thresholds(s 7249 static int sctp_getsockopt_paddr_thresholds(struct sock *sk,
7172 c 7250 char __user *optval, int len,
7173 i 7251 int __user *optlen, bool v2)
7174 { 7252 {
7175 struct sctp_paddrthlds_v2 val; 7253 struct sctp_paddrthlds_v2 val;
7176 struct sctp_transport *trans; 7254 struct sctp_transport *trans;
7177 struct sctp_association *asoc; 7255 struct sctp_association *asoc;
7178 int min; 7256 int min;
7179 7257
7180 min = v2 ? sizeof(val) : sizeof(struc 7258 min = v2 ? sizeof(val) : sizeof(struct sctp_paddrthlds);
7181 if (len < min) 7259 if (len < min)
7182 return -EINVAL; 7260 return -EINVAL;
7183 len = min; 7261 len = min;
7184 if (copy_from_user(&val, optval, len) 7262 if (copy_from_user(&val, optval, len))
7185 return -EFAULT; 7263 return -EFAULT;
7186 7264
7187 if (!sctp_is_any(sk, (const union sct 7265 if (!sctp_is_any(sk, (const union sctp_addr *)&val.spt_address)) {
7188 trans = sctp_addr_id2transpor 7266 trans = sctp_addr_id2transport(sk, &val.spt_address,
7189 7267 val.spt_assoc_id);
7190 if (!trans) 7268 if (!trans)
7191 return -ENOENT; 7269 return -ENOENT;
7192 7270
7193 val.spt_pathmaxrxt = trans->p 7271 val.spt_pathmaxrxt = trans->pathmaxrxt;
7194 val.spt_pathpfthld = trans->p 7272 val.spt_pathpfthld = trans->pf_retrans;
7195 val.spt_pathcpthld = trans->p 7273 val.spt_pathcpthld = trans->ps_retrans;
7196 7274
7197 goto out; 7275 goto out;
7198 } 7276 }
7199 7277
7200 asoc = sctp_id2assoc(sk, val.spt_asso 7278 asoc = sctp_id2assoc(sk, val.spt_assoc_id);
7201 if (!asoc && val.spt_assoc_id != SCTP 7279 if (!asoc && val.spt_assoc_id != SCTP_FUTURE_ASSOC &&
7202 sctp_style(sk, UDP)) 7280 sctp_style(sk, UDP))
7203 return -EINVAL; 7281 return -EINVAL;
7204 7282
7205 if (asoc) { 7283 if (asoc) {
7206 val.spt_pathpfthld = asoc->pf 7284 val.spt_pathpfthld = asoc->pf_retrans;
7207 val.spt_pathmaxrxt = asoc->pa 7285 val.spt_pathmaxrxt = asoc->pathmaxrxt;
7208 val.spt_pathcpthld = asoc->ps 7286 val.spt_pathcpthld = asoc->ps_retrans;
7209 } else { 7287 } else {
7210 struct sctp_sock *sp = sctp_s 7288 struct sctp_sock *sp = sctp_sk(sk);
7211 7289
7212 val.spt_pathpfthld = sp->pf_r 7290 val.spt_pathpfthld = sp->pf_retrans;
7213 val.spt_pathmaxrxt = sp->path 7291 val.spt_pathmaxrxt = sp->pathmaxrxt;
7214 val.spt_pathcpthld = sp->ps_r 7292 val.spt_pathcpthld = sp->ps_retrans;
7215 } 7293 }
7216 7294
7217 out: 7295 out:
7218 if (put_user(len, optlen) || copy_to_ 7296 if (put_user(len, optlen) || copy_to_user(optval, &val, len))
7219 return -EFAULT; 7297 return -EFAULT;
7220 7298
7221 return 0; 7299 return 0;
7222 } 7300 }
7223 7301
7224 /* 7302 /*
7225 * SCTP_GET_ASSOC_STATS 7303 * SCTP_GET_ASSOC_STATS
7226 * 7304 *
7227 * This option retrieves local per endpoint s 7305 * This option retrieves local per endpoint statistics. It is modeled
7228 * after OpenSolaris' implementation 7306 * after OpenSolaris' implementation
7229 */ 7307 */
7230 static int sctp_getsockopt_assoc_stats(struct 7308 static int sctp_getsockopt_assoc_stats(struct sock *sk, int len,
7231 char _ 7309 char __user *optval,
7232 int __ 7310 int __user *optlen)
7233 { 7311 {
7234 struct sctp_assoc_stats sas; 7312 struct sctp_assoc_stats sas;
7235 struct sctp_association *asoc = NULL; 7313 struct sctp_association *asoc = NULL;
7236 7314
7237 /* User must provide at least the ass 7315 /* User must provide at least the assoc id */
7238 if (len < sizeof(sctp_assoc_t)) 7316 if (len < sizeof(sctp_assoc_t))
7239 return -EINVAL; 7317 return -EINVAL;
7240 7318
7241 /* Allow the struct to grow and fill 7319 /* Allow the struct to grow and fill in as much as possible */
7242 len = min_t(size_t, len, sizeof(sas)) 7320 len = min_t(size_t, len, sizeof(sas));
7243 7321
7244 if (copy_from_user(&sas, optval, len) 7322 if (copy_from_user(&sas, optval, len))
7245 return -EFAULT; 7323 return -EFAULT;
7246 7324
7247 asoc = sctp_id2assoc(sk, sas.sas_asso 7325 asoc = sctp_id2assoc(sk, sas.sas_assoc_id);
7248 if (!asoc) 7326 if (!asoc)
7249 return -EINVAL; 7327 return -EINVAL;
7250 7328
7251 sas.sas_rtxchunks = asoc->stats.rtxch 7329 sas.sas_rtxchunks = asoc->stats.rtxchunks;
7252 sas.sas_gapcnt = asoc->stats.gapcnt; 7330 sas.sas_gapcnt = asoc->stats.gapcnt;
7253 sas.sas_outofseqtsns = asoc->stats.ou 7331 sas.sas_outofseqtsns = asoc->stats.outofseqtsns;
7254 sas.sas_osacks = asoc->stats.osacks; 7332 sas.sas_osacks = asoc->stats.osacks;
7255 sas.sas_isacks = asoc->stats.isacks; 7333 sas.sas_isacks = asoc->stats.isacks;
7256 sas.sas_octrlchunks = asoc->stats.oct 7334 sas.sas_octrlchunks = asoc->stats.octrlchunks;
7257 sas.sas_ictrlchunks = asoc->stats.ict 7335 sas.sas_ictrlchunks = asoc->stats.ictrlchunks;
7258 sas.sas_oodchunks = asoc->stats.oodch 7336 sas.sas_oodchunks = asoc->stats.oodchunks;
7259 sas.sas_iodchunks = asoc->stats.iodch 7337 sas.sas_iodchunks = asoc->stats.iodchunks;
7260 sas.sas_ouodchunks = asoc->stats.ouod 7338 sas.sas_ouodchunks = asoc->stats.ouodchunks;
7261 sas.sas_iuodchunks = asoc->stats.iuod 7339 sas.sas_iuodchunks = asoc->stats.iuodchunks;
7262 sas.sas_idupchunks = asoc->stats.idup 7340 sas.sas_idupchunks = asoc->stats.idupchunks;
7263 sas.sas_opackets = asoc->stats.opacke 7341 sas.sas_opackets = asoc->stats.opackets;
7264 sas.sas_ipackets = asoc->stats.ipacke 7342 sas.sas_ipackets = asoc->stats.ipackets;
7265 7343
7266 /* New high max rto observed, will re 7344 /* New high max rto observed, will return 0 if not a single
7267 * RTO update took place. obs_rto_ipa 7345 * RTO update took place. obs_rto_ipaddr will be bogus
7268 * in such a case 7346 * in such a case
7269 */ 7347 */
7270 sas.sas_maxrto = asoc->stats.max_obs_ 7348 sas.sas_maxrto = asoc->stats.max_obs_rto;
7271 memcpy(&sas.sas_obs_rto_ipaddr, &asoc 7349 memcpy(&sas.sas_obs_rto_ipaddr, &asoc->stats.obs_rto_ipaddr,
7272 sizeof(struct sockaddr_storag 7350 sizeof(struct sockaddr_storage));
7273 7351
7274 /* Mark beginning of a new observatio 7352 /* Mark beginning of a new observation period */
7275 asoc->stats.max_obs_rto = asoc->rto_m 7353 asoc->stats.max_obs_rto = asoc->rto_min;
7276 7354
7277 if (put_user(len, optlen)) 7355 if (put_user(len, optlen))
7278 return -EFAULT; 7356 return -EFAULT;
7279 7357
7280 pr_debug("%s: len:%d, assoc_id:%d\n", 7358 pr_debug("%s: len:%d, assoc_id:%d\n", __func__, len, sas.sas_assoc_id);
7281 7359
7282 if (copy_to_user(optval, &sas, len)) 7360 if (copy_to_user(optval, &sas, len))
7283 return -EFAULT; 7361 return -EFAULT;
7284 7362
7285 return 0; 7363 return 0;
7286 } 7364 }
7287 7365
7288 static int sctp_getsockopt_recvrcvinfo(struct 7366 static int sctp_getsockopt_recvrcvinfo(struct sock *sk, int len,
7289 char _ 7367 char __user *optval,
7290 int __ 7368 int __user *optlen)
7291 { 7369 {
7292 int val = 0; 7370 int val = 0;
7293 7371
7294 if (len < sizeof(int)) 7372 if (len < sizeof(int))
7295 return -EINVAL; 7373 return -EINVAL;
7296 7374
7297 len = sizeof(int); 7375 len = sizeof(int);
7298 if (sctp_sk(sk)->recvrcvinfo) 7376 if (sctp_sk(sk)->recvrcvinfo)
7299 val = 1; 7377 val = 1;
7300 if (put_user(len, optlen)) 7378 if (put_user(len, optlen))
7301 return -EFAULT; 7379 return -EFAULT;
7302 if (copy_to_user(optval, &val, len)) 7380 if (copy_to_user(optval, &val, len))
7303 return -EFAULT; 7381 return -EFAULT;
7304 7382
7305 return 0; 7383 return 0;
7306 } 7384 }
7307 7385
7308 static int sctp_getsockopt_recvnxtinfo(struct 7386 static int sctp_getsockopt_recvnxtinfo(struct sock *sk, int len,
7309 char _ 7387 char __user *optval,
7310 int __ 7388 int __user *optlen)
7311 { 7389 {
7312 int val = 0; 7390 int val = 0;
7313 7391
7314 if (len < sizeof(int)) 7392 if (len < sizeof(int))
7315 return -EINVAL; 7393 return -EINVAL;
7316 7394
7317 len = sizeof(int); 7395 len = sizeof(int);
7318 if (sctp_sk(sk)->recvnxtinfo) 7396 if (sctp_sk(sk)->recvnxtinfo)
7319 val = 1; 7397 val = 1;
7320 if (put_user(len, optlen)) 7398 if (put_user(len, optlen))
7321 return -EFAULT; 7399 return -EFAULT;
7322 if (copy_to_user(optval, &val, len)) 7400 if (copy_to_user(optval, &val, len))
7323 return -EFAULT; 7401 return -EFAULT;
7324 7402
7325 return 0; 7403 return 0;
7326 } 7404 }
7327 7405
7328 static int sctp_getsockopt_pr_supported(struc 7406 static int sctp_getsockopt_pr_supported(struct sock *sk, int len,
7329 char 7407 char __user *optval,
7330 int _ 7408 int __user *optlen)
7331 { 7409 {
7332 struct sctp_assoc_value params; 7410 struct sctp_assoc_value params;
7333 struct sctp_association *asoc; 7411 struct sctp_association *asoc;
7334 int retval = -EFAULT; 7412 int retval = -EFAULT;
7335 7413
7336 if (len < sizeof(params)) { 7414 if (len < sizeof(params)) {
7337 retval = -EINVAL; 7415 retval = -EINVAL;
7338 goto out; 7416 goto out;
7339 } 7417 }
7340 7418
7341 len = sizeof(params); 7419 len = sizeof(params);
7342 if (copy_from_user(¶ms, optval, l 7420 if (copy_from_user(¶ms, optval, len))
7343 goto out; 7421 goto out;
7344 7422
7345 asoc = sctp_id2assoc(sk, params.assoc 7423 asoc = sctp_id2assoc(sk, params.assoc_id);
7346 if (!asoc && params.assoc_id != SCTP_ 7424 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7347 sctp_style(sk, UDP)) { 7425 sctp_style(sk, UDP)) {
7348 retval = -EINVAL; 7426 retval = -EINVAL;
7349 goto out; 7427 goto out;
7350 } 7428 }
7351 7429
7352 params.assoc_value = asoc ? asoc->pee 7430 params.assoc_value = asoc ? asoc->peer.prsctp_capable
7353 : sctp_sk(s 7431 : sctp_sk(sk)->ep->prsctp_enable;
7354 7432
7355 if (put_user(len, optlen)) 7433 if (put_user(len, optlen))
7356 goto out; 7434 goto out;
7357 7435
7358 if (copy_to_user(optval, ¶ms, len 7436 if (copy_to_user(optval, ¶ms, len))
7359 goto out; 7437 goto out;
7360 7438
7361 retval = 0; 7439 retval = 0;
7362 7440
7363 out: 7441 out:
7364 return retval; 7442 return retval;
7365 } 7443 }
7366 7444
7367 static int sctp_getsockopt_default_prinfo(str 7445 static int sctp_getsockopt_default_prinfo(struct sock *sk, int len,
7368 cha 7446 char __user *optval,
7369 int 7447 int __user *optlen)
7370 { 7448 {
7371 struct sctp_default_prinfo info; 7449 struct sctp_default_prinfo info;
7372 struct sctp_association *asoc; 7450 struct sctp_association *asoc;
7373 int retval = -EFAULT; 7451 int retval = -EFAULT;
7374 7452
7375 if (len < sizeof(info)) { 7453 if (len < sizeof(info)) {
7376 retval = -EINVAL; 7454 retval = -EINVAL;
7377 goto out; 7455 goto out;
7378 } 7456 }
7379 7457
7380 len = sizeof(info); 7458 len = sizeof(info);
7381 if (copy_from_user(&info, optval, len 7459 if (copy_from_user(&info, optval, len))
7382 goto out; 7460 goto out;
7383 7461
7384 asoc = sctp_id2assoc(sk, info.pr_asso 7462 asoc = sctp_id2assoc(sk, info.pr_assoc_id);
7385 if (!asoc && info.pr_assoc_id != SCTP 7463 if (!asoc && info.pr_assoc_id != SCTP_FUTURE_ASSOC &&
7386 sctp_style(sk, UDP)) { 7464 sctp_style(sk, UDP)) {
7387 retval = -EINVAL; 7465 retval = -EINVAL;
7388 goto out; 7466 goto out;
7389 } 7467 }
7390 7468
7391 if (asoc) { 7469 if (asoc) {
7392 info.pr_policy = SCTP_PR_POLI 7470 info.pr_policy = SCTP_PR_POLICY(asoc->default_flags);
7393 info.pr_value = asoc->default 7471 info.pr_value = asoc->default_timetolive;
7394 } else { 7472 } else {
7395 struct sctp_sock *sp = sctp_s 7473 struct sctp_sock *sp = sctp_sk(sk);
7396 7474
7397 info.pr_policy = SCTP_PR_POLI 7475 info.pr_policy = SCTP_PR_POLICY(sp->default_flags);
7398 info.pr_value = sp->default_t 7476 info.pr_value = sp->default_timetolive;
7399 } 7477 }
7400 7478
7401 if (put_user(len, optlen)) 7479 if (put_user(len, optlen))
7402 goto out; 7480 goto out;
7403 7481
7404 if (copy_to_user(optval, &info, len)) 7482 if (copy_to_user(optval, &info, len))
7405 goto out; 7483 goto out;
7406 7484
7407 retval = 0; 7485 retval = 0;
7408 7486
7409 out: 7487 out:
7410 return retval; 7488 return retval;
7411 } 7489 }
7412 7490
7413 static int sctp_getsockopt_pr_assocstatus(str 7491 static int sctp_getsockopt_pr_assocstatus(struct sock *sk, int len,
7414 cha 7492 char __user *optval,
7415 int 7493 int __user *optlen)
7416 { 7494 {
7417 struct sctp_prstatus params; 7495 struct sctp_prstatus params;
7418 struct sctp_association *asoc; 7496 struct sctp_association *asoc;
7419 int policy; 7497 int policy;
7420 int retval = -EINVAL; 7498 int retval = -EINVAL;
7421 7499
7422 if (len < sizeof(params)) 7500 if (len < sizeof(params))
7423 goto out; 7501 goto out;
7424 7502
7425 len = sizeof(params); 7503 len = sizeof(params);
7426 if (copy_from_user(¶ms, optval, l 7504 if (copy_from_user(¶ms, optval, len)) {
7427 retval = -EFAULT; 7505 retval = -EFAULT;
7428 goto out; 7506 goto out;
7429 } 7507 }
7430 7508
7431 policy = params.sprstat_policy; 7509 policy = params.sprstat_policy;
7432 if (!policy || (policy & ~(SCTP_PR_SC 7510 if (!policy || (policy & ~(SCTP_PR_SCTP_MASK | SCTP_PR_SCTP_ALL)) ||
7433 ((policy & SCTP_PR_SCTP_ALL) && ( 7511 ((policy & SCTP_PR_SCTP_ALL) && (policy & SCTP_PR_SCTP_MASK)))
7434 goto out; 7512 goto out;
7435 7513
7436 asoc = sctp_id2assoc(sk, params.sprst 7514 asoc = sctp_id2assoc(sk, params.sprstat_assoc_id);
7437 if (!asoc) 7515 if (!asoc)
7438 goto out; 7516 goto out;
7439 7517
7440 if (policy == SCTP_PR_SCTP_ALL) { 7518 if (policy == SCTP_PR_SCTP_ALL) {
7441 params.sprstat_abandoned_unse 7519 params.sprstat_abandoned_unsent = 0;
7442 params.sprstat_abandoned_sent 7520 params.sprstat_abandoned_sent = 0;
7443 for (policy = 0; policy <= SC 7521 for (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) {
7444 params.sprstat_abando 7522 params.sprstat_abandoned_unsent +=
7445 asoc->abandon 7523 asoc->abandoned_unsent[policy];
7446 params.sprstat_abando 7524 params.sprstat_abandoned_sent +=
7447 asoc->abandon 7525 asoc->abandoned_sent[policy];
7448 } 7526 }
7449 } else { 7527 } else {
7450 params.sprstat_abandoned_unse 7528 params.sprstat_abandoned_unsent =
7451 asoc->abandoned_unsen 7529 asoc->abandoned_unsent[__SCTP_PR_INDEX(policy)];
7452 params.sprstat_abandoned_sent 7530 params.sprstat_abandoned_sent =
7453 asoc->abandoned_sent[ 7531 asoc->abandoned_sent[__SCTP_PR_INDEX(policy)];
7454 } 7532 }
7455 7533
7456 if (put_user(len, optlen)) { 7534 if (put_user(len, optlen)) {
7457 retval = -EFAULT; 7535 retval = -EFAULT;
7458 goto out; 7536 goto out;
7459 } 7537 }
7460 7538
7461 if (copy_to_user(optval, ¶ms, len 7539 if (copy_to_user(optval, ¶ms, len)) {
7462 retval = -EFAULT; 7540 retval = -EFAULT;
7463 goto out; 7541 goto out;
7464 } 7542 }
7465 7543
7466 retval = 0; 7544 retval = 0;
7467 7545
7468 out: 7546 out:
7469 return retval; 7547 return retval;
7470 } 7548 }
7471 7549
7472 static int sctp_getsockopt_pr_streamstatus(st 7550 static int sctp_getsockopt_pr_streamstatus(struct sock *sk, int len,
7473 ch 7551 char __user *optval,
7474 in 7552 int __user *optlen)
7475 { 7553 {
7476 struct sctp_stream_out_ext *streamout 7554 struct sctp_stream_out_ext *streamoute;
7477 struct sctp_association *asoc; 7555 struct sctp_association *asoc;
7478 struct sctp_prstatus params; 7556 struct sctp_prstatus params;
7479 int retval = -EINVAL; 7557 int retval = -EINVAL;
7480 int policy; 7558 int policy;
7481 7559
7482 if (len < sizeof(params)) 7560 if (len < sizeof(params))
7483 goto out; 7561 goto out;
7484 7562
7485 len = sizeof(params); 7563 len = sizeof(params);
7486 if (copy_from_user(¶ms, optval, l 7564 if (copy_from_user(¶ms, optval, len)) {
7487 retval = -EFAULT; 7565 retval = -EFAULT;
7488 goto out; 7566 goto out;
7489 } 7567 }
7490 7568
7491 policy = params.sprstat_policy; 7569 policy = params.sprstat_policy;
7492 if (!policy || (policy & ~(SCTP_PR_SC 7570 if (!policy || (policy & ~(SCTP_PR_SCTP_MASK | SCTP_PR_SCTP_ALL)) ||
7493 ((policy & SCTP_PR_SCTP_ALL) && ( 7571 ((policy & SCTP_PR_SCTP_ALL) && (policy & SCTP_PR_SCTP_MASK)))
7494 goto out; 7572 goto out;
7495 7573
7496 asoc = sctp_id2assoc(sk, params.sprst 7574 asoc = sctp_id2assoc(sk, params.sprstat_assoc_id);
7497 if (!asoc || params.sprstat_sid >= as 7575 if (!asoc || params.sprstat_sid >= asoc->stream.outcnt)
7498 goto out; 7576 goto out;
7499 7577
7500 streamoute = SCTP_SO(&asoc->stream, p 7578 streamoute = SCTP_SO(&asoc->stream, params.sprstat_sid)->ext;
7501 if (!streamoute) { 7579 if (!streamoute) {
7502 /* Not allocated yet, means a 7580 /* Not allocated yet, means all stats are 0 */
7503 params.sprstat_abandoned_unse 7581 params.sprstat_abandoned_unsent = 0;
7504 params.sprstat_abandoned_sent 7582 params.sprstat_abandoned_sent = 0;
7505 retval = 0; 7583 retval = 0;
7506 goto out; 7584 goto out;
7507 } 7585 }
7508 7586
7509 if (policy == SCTP_PR_SCTP_ALL) { 7587 if (policy == SCTP_PR_SCTP_ALL) {
7510 params.sprstat_abandoned_unse 7588 params.sprstat_abandoned_unsent = 0;
7511 params.sprstat_abandoned_sent 7589 params.sprstat_abandoned_sent = 0;
7512 for (policy = 0; policy <= SC 7590 for (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) {
7513 params.sprstat_abando 7591 params.sprstat_abandoned_unsent +=
7514 streamoute->a 7592 streamoute->abandoned_unsent[policy];
7515 params.sprstat_abando 7593 params.sprstat_abandoned_sent +=
7516 streamoute->a 7594 streamoute->abandoned_sent[policy];
7517 } 7595 }
7518 } else { 7596 } else {
7519 params.sprstat_abandoned_unse 7597 params.sprstat_abandoned_unsent =
7520 streamoute->abandoned 7598 streamoute->abandoned_unsent[__SCTP_PR_INDEX(policy)];
7521 params.sprstat_abandoned_sent 7599 params.sprstat_abandoned_sent =
7522 streamoute->abandoned 7600 streamoute->abandoned_sent[__SCTP_PR_INDEX(policy)];
7523 } 7601 }
7524 7602
7525 if (put_user(len, optlen) || copy_to_ 7603 if (put_user(len, optlen) || copy_to_user(optval, ¶ms, len)) {
7526 retval = -EFAULT; 7604 retval = -EFAULT;
7527 goto out; 7605 goto out;
7528 } 7606 }
7529 7607
7530 retval = 0; 7608 retval = 0;
7531 7609
7532 out: 7610 out:
7533 return retval; 7611 return retval;
7534 } 7612 }
7535 7613
7536 static int sctp_getsockopt_reconfig_supported 7614 static int sctp_getsockopt_reconfig_supported(struct sock *sk, int len,
7537 7615 char __user *optval,
7538 7616 int __user *optlen)
7539 { 7617 {
7540 struct sctp_assoc_value params; 7618 struct sctp_assoc_value params;
7541 struct sctp_association *asoc; 7619 struct sctp_association *asoc;
7542 int retval = -EFAULT; 7620 int retval = -EFAULT;
7543 7621
7544 if (len < sizeof(params)) { 7622 if (len < sizeof(params)) {
7545 retval = -EINVAL; 7623 retval = -EINVAL;
7546 goto out; 7624 goto out;
7547 } 7625 }
7548 7626
7549 len = sizeof(params); 7627 len = sizeof(params);
7550 if (copy_from_user(¶ms, optval, l 7628 if (copy_from_user(¶ms, optval, len))
7551 goto out; 7629 goto out;
7552 7630
7553 asoc = sctp_id2assoc(sk, params.assoc 7631 asoc = sctp_id2assoc(sk, params.assoc_id);
7554 if (!asoc && params.assoc_id != SCTP_ 7632 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7555 sctp_style(sk, UDP)) { 7633 sctp_style(sk, UDP)) {
7556 retval = -EINVAL; 7634 retval = -EINVAL;
7557 goto out; 7635 goto out;
7558 } 7636 }
7559 7637
7560 params.assoc_value = asoc ? asoc->pee 7638 params.assoc_value = asoc ? asoc->peer.reconf_capable
7561 : sctp_sk(s 7639 : sctp_sk(sk)->ep->reconf_enable;
7562 7640
7563 if (put_user(len, optlen)) 7641 if (put_user(len, optlen))
7564 goto out; 7642 goto out;
7565 7643
7566 if (copy_to_user(optval, ¶ms, len 7644 if (copy_to_user(optval, ¶ms, len))
7567 goto out; 7645 goto out;
7568 7646
7569 retval = 0; 7647 retval = 0;
7570 7648
7571 out: 7649 out:
7572 return retval; 7650 return retval;
7573 } 7651 }
7574 7652
7575 static int sctp_getsockopt_enable_strreset(st 7653 static int sctp_getsockopt_enable_strreset(struct sock *sk, int len,
7576 ch 7654 char __user *optval,
7577 in 7655 int __user *optlen)
7578 { 7656 {
7579 struct sctp_assoc_value params; 7657 struct sctp_assoc_value params;
7580 struct sctp_association *asoc; 7658 struct sctp_association *asoc;
7581 int retval = -EFAULT; 7659 int retval = -EFAULT;
7582 7660
7583 if (len < sizeof(params)) { 7661 if (len < sizeof(params)) {
7584 retval = -EINVAL; 7662 retval = -EINVAL;
7585 goto out; 7663 goto out;
7586 } 7664 }
7587 7665
7588 len = sizeof(params); 7666 len = sizeof(params);
7589 if (copy_from_user(¶ms, optval, l 7667 if (copy_from_user(¶ms, optval, len))
7590 goto out; 7668 goto out;
7591 7669
7592 asoc = sctp_id2assoc(sk, params.assoc 7670 asoc = sctp_id2assoc(sk, params.assoc_id);
7593 if (!asoc && params.assoc_id != SCTP_ 7671 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7594 sctp_style(sk, UDP)) { 7672 sctp_style(sk, UDP)) {
7595 retval = -EINVAL; 7673 retval = -EINVAL;
7596 goto out; 7674 goto out;
7597 } 7675 }
7598 7676
7599 params.assoc_value = asoc ? asoc->str 7677 params.assoc_value = asoc ? asoc->strreset_enable
7600 : sctp_sk(s 7678 : sctp_sk(sk)->ep->strreset_enable;
7601 7679
7602 if (put_user(len, optlen)) 7680 if (put_user(len, optlen))
7603 goto out; 7681 goto out;
7604 7682
7605 if (copy_to_user(optval, ¶ms, len 7683 if (copy_to_user(optval, ¶ms, len))
7606 goto out; 7684 goto out;
7607 7685
7608 retval = 0; 7686 retval = 0;
7609 7687
7610 out: 7688 out:
7611 return retval; 7689 return retval;
7612 } 7690 }
7613 7691
7614 static int sctp_getsockopt_scheduler(struct s 7692 static int sctp_getsockopt_scheduler(struct sock *sk, int len,
7615 char __u 7693 char __user *optval,
7616 int __us 7694 int __user *optlen)
7617 { 7695 {
7618 struct sctp_assoc_value params; 7696 struct sctp_assoc_value params;
7619 struct sctp_association *asoc; 7697 struct sctp_association *asoc;
7620 int retval = -EFAULT; 7698 int retval = -EFAULT;
7621 7699
7622 if (len < sizeof(params)) { 7700 if (len < sizeof(params)) {
7623 retval = -EINVAL; 7701 retval = -EINVAL;
7624 goto out; 7702 goto out;
7625 } 7703 }
7626 7704
7627 len = sizeof(params); 7705 len = sizeof(params);
7628 if (copy_from_user(¶ms, optval, l 7706 if (copy_from_user(¶ms, optval, len))
7629 goto out; 7707 goto out;
7630 7708
7631 asoc = sctp_id2assoc(sk, params.assoc 7709 asoc = sctp_id2assoc(sk, params.assoc_id);
7632 if (!asoc && params.assoc_id != SCTP_ 7710 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7633 sctp_style(sk, UDP)) { 7711 sctp_style(sk, UDP)) {
7634 retval = -EINVAL; 7712 retval = -EINVAL;
7635 goto out; 7713 goto out;
7636 } 7714 }
7637 7715
7638 params.assoc_value = asoc ? sctp_sche 7716 params.assoc_value = asoc ? sctp_sched_get_sched(asoc)
7639 : sctp_sk(s 7717 : sctp_sk(sk)->default_ss;
7640 7718
7641 if (put_user(len, optlen)) 7719 if (put_user(len, optlen))
7642 goto out; 7720 goto out;
7643 7721
7644 if (copy_to_user(optval, ¶ms, len 7722 if (copy_to_user(optval, ¶ms, len))
7645 goto out; 7723 goto out;
7646 7724
7647 retval = 0; 7725 retval = 0;
7648 7726
7649 out: 7727 out:
7650 return retval; 7728 return retval;
7651 } 7729 }
7652 7730
7653 static int sctp_getsockopt_scheduler_value(st 7731 static int sctp_getsockopt_scheduler_value(struct sock *sk, int len,
7654 ch 7732 char __user *optval,
7655 in 7733 int __user *optlen)
7656 { 7734 {
7657 struct sctp_stream_value params; 7735 struct sctp_stream_value params;
7658 struct sctp_association *asoc; 7736 struct sctp_association *asoc;
7659 int retval = -EFAULT; 7737 int retval = -EFAULT;
7660 7738
7661 if (len < sizeof(params)) { 7739 if (len < sizeof(params)) {
7662 retval = -EINVAL; 7740 retval = -EINVAL;
7663 goto out; 7741 goto out;
7664 } 7742 }
7665 7743
7666 len = sizeof(params); 7744 len = sizeof(params);
7667 if (copy_from_user(¶ms, optval, l 7745 if (copy_from_user(¶ms, optval, len))
7668 goto out; 7746 goto out;
7669 7747
7670 asoc = sctp_id2assoc(sk, params.assoc 7748 asoc = sctp_id2assoc(sk, params.assoc_id);
7671 if (!asoc) { 7749 if (!asoc) {
7672 retval = -EINVAL; 7750 retval = -EINVAL;
7673 goto out; 7751 goto out;
7674 } 7752 }
7675 7753
7676 retval = sctp_sched_get_value(asoc, p 7754 retval = sctp_sched_get_value(asoc, params.stream_id,
7677 ¶ms 7755 ¶ms.stream_value);
7678 if (retval) 7756 if (retval)
7679 goto out; 7757 goto out;
7680 7758
7681 if (put_user(len, optlen)) { 7759 if (put_user(len, optlen)) {
7682 retval = -EFAULT; 7760 retval = -EFAULT;
7683 goto out; 7761 goto out;
7684 } 7762 }
7685 7763
7686 if (copy_to_user(optval, ¶ms, len 7764 if (copy_to_user(optval, ¶ms, len)) {
7687 retval = -EFAULT; 7765 retval = -EFAULT;
7688 goto out; 7766 goto out;
7689 } 7767 }
7690 7768
7691 out: 7769 out:
7692 return retval; 7770 return retval;
7693 } 7771 }
7694 7772
7695 static int sctp_getsockopt_interleaving_suppo 7773 static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len,
7696 7774 char __user *optval,
7697 7775 int __user *optlen)
7698 { 7776 {
7699 struct sctp_assoc_value params; 7777 struct sctp_assoc_value params;
7700 struct sctp_association *asoc; 7778 struct sctp_association *asoc;
7701 int retval = -EFAULT; 7779 int retval = -EFAULT;
7702 7780
7703 if (len < sizeof(params)) { 7781 if (len < sizeof(params)) {
7704 retval = -EINVAL; 7782 retval = -EINVAL;
7705 goto out; 7783 goto out;
7706 } 7784 }
7707 7785
7708 len = sizeof(params); 7786 len = sizeof(params);
7709 if (copy_from_user(¶ms, optval, l 7787 if (copy_from_user(¶ms, optval, len))
7710 goto out; 7788 goto out;
7711 7789
7712 asoc = sctp_id2assoc(sk, params.assoc 7790 asoc = sctp_id2assoc(sk, params.assoc_id);
7713 if (!asoc && params.assoc_id != SCTP_ 7791 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7714 sctp_style(sk, UDP)) { 7792 sctp_style(sk, UDP)) {
7715 retval = -EINVAL; 7793 retval = -EINVAL;
7716 goto out; 7794 goto out;
7717 } 7795 }
7718 7796
7719 params.assoc_value = asoc ? asoc->pee 7797 params.assoc_value = asoc ? asoc->peer.intl_capable
7720 : sctp_sk(s 7798 : sctp_sk(sk)->ep->intl_enable;
7721 7799
7722 if (put_user(len, optlen)) 7800 if (put_user(len, optlen))
7723 goto out; 7801 goto out;
7724 7802
7725 if (copy_to_user(optval, ¶ms, len 7803 if (copy_to_user(optval, ¶ms, len))
7726 goto out; 7804 goto out;
7727 7805
7728 retval = 0; 7806 retval = 0;
7729 7807
7730 out: 7808 out:
7731 return retval; 7809 return retval;
7732 } 7810 }
7733 7811
7734 static int sctp_getsockopt_reuse_port(struct 7812 static int sctp_getsockopt_reuse_port(struct sock *sk, int len,
7735 char __ 7813 char __user *optval,
7736 int __u 7814 int __user *optlen)
7737 { 7815 {
7738 int val; 7816 int val;
7739 7817
7740 if (len < sizeof(int)) 7818 if (len < sizeof(int))
7741 return -EINVAL; 7819 return -EINVAL;
7742 7820
7743 len = sizeof(int); 7821 len = sizeof(int);
7744 val = sctp_sk(sk)->reuse; 7822 val = sctp_sk(sk)->reuse;
7745 if (put_user(len, optlen)) 7823 if (put_user(len, optlen))
7746 return -EFAULT; 7824 return -EFAULT;
7747 7825
7748 if (copy_to_user(optval, &val, len)) 7826 if (copy_to_user(optval, &val, len))
7749 return -EFAULT; 7827 return -EFAULT;
7750 7828
7751 return 0; 7829 return 0;
7752 } 7830 }
7753 7831
7754 static int sctp_getsockopt_event(struct sock 7832 static int sctp_getsockopt_event(struct sock *sk, int len, char __user *optval,
7755 int __user * 7833 int __user *optlen)
7756 { 7834 {
7757 struct sctp_association *asoc; 7835 struct sctp_association *asoc;
7758 struct sctp_event param; 7836 struct sctp_event param;
7759 __u16 subscribe; 7837 __u16 subscribe;
7760 7838
7761 if (len < sizeof(param)) 7839 if (len < sizeof(param))
7762 return -EINVAL; 7840 return -EINVAL;
7763 7841
7764 len = sizeof(param); 7842 len = sizeof(param);
7765 if (copy_from_user(¶m, optval, le 7843 if (copy_from_user(¶m, optval, len))
7766 return -EFAULT; 7844 return -EFAULT;
7767 7845
7768 if (param.se_type < SCTP_SN_TYPE_BASE 7846 if (param.se_type < SCTP_SN_TYPE_BASE ||
7769 param.se_type > SCTP_SN_TYPE_MAX) 7847 param.se_type > SCTP_SN_TYPE_MAX)
7770 return -EINVAL; 7848 return -EINVAL;
7771 7849
7772 asoc = sctp_id2assoc(sk, param.se_ass 7850 asoc = sctp_id2assoc(sk, param.se_assoc_id);
7773 if (!asoc && param.se_assoc_id != SCT 7851 if (!asoc && param.se_assoc_id != SCTP_FUTURE_ASSOC &&
7774 sctp_style(sk, UDP)) 7852 sctp_style(sk, UDP))
7775 return -EINVAL; 7853 return -EINVAL;
7776 7854
7777 subscribe = asoc ? asoc->subscribe : 7855 subscribe = asoc ? asoc->subscribe : sctp_sk(sk)->subscribe;
7778 param.se_on = sctp_ulpevent_type_enab 7856 param.se_on = sctp_ulpevent_type_enabled(subscribe, param.se_type);
7779 7857
7780 if (put_user(len, optlen)) 7858 if (put_user(len, optlen))
7781 return -EFAULT; 7859 return -EFAULT;
7782 7860
7783 if (copy_to_user(optval, ¶m, len) 7861 if (copy_to_user(optval, ¶m, len))
7784 return -EFAULT; 7862 return -EFAULT;
7785 7863
7786 return 0; 7864 return 0;
7787 } 7865 }
7788 7866
7789 static int sctp_getsockopt_asconf_supported(s 7867 static int sctp_getsockopt_asconf_supported(struct sock *sk, int len,
7790 c 7868 char __user *optval,
7791 i 7869 int __user *optlen)
7792 { 7870 {
7793 struct sctp_assoc_value params; 7871 struct sctp_assoc_value params;
7794 struct sctp_association *asoc; 7872 struct sctp_association *asoc;
7795 int retval = -EFAULT; 7873 int retval = -EFAULT;
7796 7874
7797 if (len < sizeof(params)) { 7875 if (len < sizeof(params)) {
7798 retval = -EINVAL; 7876 retval = -EINVAL;
7799 goto out; 7877 goto out;
7800 } 7878 }
7801 7879
7802 len = sizeof(params); 7880 len = sizeof(params);
7803 if (copy_from_user(¶ms, optval, l 7881 if (copy_from_user(¶ms, optval, len))
7804 goto out; 7882 goto out;
7805 7883
7806 asoc = sctp_id2assoc(sk, params.assoc 7884 asoc = sctp_id2assoc(sk, params.assoc_id);
7807 if (!asoc && params.assoc_id != SCTP_ 7885 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7808 sctp_style(sk, UDP)) { 7886 sctp_style(sk, UDP)) {
7809 retval = -EINVAL; 7887 retval = -EINVAL;
7810 goto out; 7888 goto out;
7811 } 7889 }
7812 7890
7813 params.assoc_value = asoc ? asoc->pee 7891 params.assoc_value = asoc ? asoc->peer.asconf_capable
7814 : sctp_sk(s 7892 : sctp_sk(sk)->ep->asconf_enable;
7815 7893
7816 if (put_user(len, optlen)) 7894 if (put_user(len, optlen))
7817 goto out; 7895 goto out;
7818 7896
7819 if (copy_to_user(optval, ¶ms, len 7897 if (copy_to_user(optval, ¶ms, len))
7820 goto out; 7898 goto out;
7821 7899
7822 retval = 0; 7900 retval = 0;
7823 7901
7824 out: 7902 out:
7825 return retval; 7903 return retval;
7826 } 7904 }
7827 7905
7828 static int sctp_getsockopt_auth_supported(str 7906 static int sctp_getsockopt_auth_supported(struct sock *sk, int len,
7829 cha 7907 char __user *optval,
7830 int 7908 int __user *optlen)
7831 { 7909 {
7832 struct sctp_assoc_value params; 7910 struct sctp_assoc_value params;
7833 struct sctp_association *asoc; 7911 struct sctp_association *asoc;
7834 int retval = -EFAULT; 7912 int retval = -EFAULT;
7835 7913
7836 if (len < sizeof(params)) { 7914 if (len < sizeof(params)) {
7837 retval = -EINVAL; 7915 retval = -EINVAL;
7838 goto out; 7916 goto out;
7839 } 7917 }
7840 7918
7841 len = sizeof(params); 7919 len = sizeof(params);
7842 if (copy_from_user(¶ms, optval, l 7920 if (copy_from_user(¶ms, optval, len))
7843 goto out; 7921 goto out;
7844 7922
7845 asoc = sctp_id2assoc(sk, params.assoc 7923 asoc = sctp_id2assoc(sk, params.assoc_id);
7846 if (!asoc && params.assoc_id != SCTP_ 7924 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7847 sctp_style(sk, UDP)) { 7925 sctp_style(sk, UDP)) {
7848 retval = -EINVAL; 7926 retval = -EINVAL;
7849 goto out; 7927 goto out;
7850 } 7928 }
7851 7929
7852 params.assoc_value = asoc ? asoc->pee 7930 params.assoc_value = asoc ? asoc->peer.auth_capable
7853 : sctp_sk(s 7931 : sctp_sk(sk)->ep->auth_enable;
7854 7932
7855 if (put_user(len, optlen)) 7933 if (put_user(len, optlen))
7856 goto out; 7934 goto out;
7857 7935
7858 if (copy_to_user(optval, ¶ms, len 7936 if (copy_to_user(optval, ¶ms, len))
7859 goto out; 7937 goto out;
7860 7938
7861 retval = 0; 7939 retval = 0;
7862 7940
7863 out: 7941 out:
7864 return retval; 7942 return retval;
7865 } 7943 }
7866 7944
7867 static int sctp_getsockopt_ecn_supported(stru 7945 static int sctp_getsockopt_ecn_supported(struct sock *sk, int len,
7868 char 7946 char __user *optval,
7869 int 7947 int __user *optlen)
7870 { 7948 {
7871 struct sctp_assoc_value params; 7949 struct sctp_assoc_value params;
7872 struct sctp_association *asoc; 7950 struct sctp_association *asoc;
7873 int retval = -EFAULT; 7951 int retval = -EFAULT;
7874 7952
7875 if (len < sizeof(params)) { 7953 if (len < sizeof(params)) {
7876 retval = -EINVAL; 7954 retval = -EINVAL;
7877 goto out; 7955 goto out;
7878 } 7956 }
7879 7957
7880 len = sizeof(params); 7958 len = sizeof(params);
7881 if (copy_from_user(¶ms, optval, l 7959 if (copy_from_user(¶ms, optval, len))
7882 goto out; 7960 goto out;
7883 7961
7884 asoc = sctp_id2assoc(sk, params.assoc 7962 asoc = sctp_id2assoc(sk, params.assoc_id);
7885 if (!asoc && params.assoc_id != SCTP_ 7963 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7886 sctp_style(sk, UDP)) { 7964 sctp_style(sk, UDP)) {
7887 retval = -EINVAL; 7965 retval = -EINVAL;
7888 goto out; 7966 goto out;
7889 } 7967 }
7890 7968
7891 params.assoc_value = asoc ? asoc->pee 7969 params.assoc_value = asoc ? asoc->peer.ecn_capable
7892 : sctp_sk(s 7970 : sctp_sk(sk)->ep->ecn_enable;
7893 7971
7894 if (put_user(len, optlen)) 7972 if (put_user(len, optlen))
7895 goto out; 7973 goto out;
7896 7974
7897 if (copy_to_user(optval, ¶ms, len 7975 if (copy_to_user(optval, ¶ms, len))
7898 goto out; 7976 goto out;
7899 7977
7900 retval = 0; 7978 retval = 0;
7901 7979
7902 out: 7980 out:
7903 return retval; 7981 return retval;
7904 } 7982 }
7905 7983
7906 static int sctp_getsockopt_pf_expose(struct s 7984 static int sctp_getsockopt_pf_expose(struct sock *sk, int len,
7907 char __u 7985 char __user *optval,
7908 int __us 7986 int __user *optlen)
7909 { 7987 {
7910 struct sctp_assoc_value params; 7988 struct sctp_assoc_value params;
7911 struct sctp_association *asoc; 7989 struct sctp_association *asoc;
7912 int retval = -EFAULT; 7990 int retval = -EFAULT;
7913 7991
7914 if (len < sizeof(params)) { 7992 if (len < sizeof(params)) {
7915 retval = -EINVAL; 7993 retval = -EINVAL;
7916 goto out; 7994 goto out;
7917 } 7995 }
7918 7996
7919 len = sizeof(params); 7997 len = sizeof(params);
7920 if (copy_from_user(¶ms, optval, l 7998 if (copy_from_user(¶ms, optval, len))
7921 goto out; 7999 goto out;
7922 8000
7923 asoc = sctp_id2assoc(sk, params.assoc 8001 asoc = sctp_id2assoc(sk, params.assoc_id);
7924 if (!asoc && params.assoc_id != SCTP_ 8002 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7925 sctp_style(sk, UDP)) { 8003 sctp_style(sk, UDP)) {
7926 retval = -EINVAL; 8004 retval = -EINVAL;
7927 goto out; 8005 goto out;
7928 } 8006 }
7929 8007
7930 params.assoc_value = asoc ? asoc->pf_ 8008 params.assoc_value = asoc ? asoc->pf_expose
7931 : sctp_sk(s 8009 : sctp_sk(sk)->pf_expose;
7932 8010
7933 if (put_user(len, optlen)) 8011 if (put_user(len, optlen))
7934 goto out; 8012 goto out;
7935 8013
7936 if (copy_to_user(optval, ¶ms, len 8014 if (copy_to_user(optval, ¶ms, len))
7937 goto out; 8015 goto out;
7938 8016
7939 retval = 0; 8017 retval = 0;
7940 8018
7941 out: 8019 out:
7942 return retval; 8020 return retval;
7943 } 8021 }
7944 8022
7945 static int sctp_getsockopt_encap_port(struct <<
7946 char __ <<
7947 { <<
7948 struct sctp_association *asoc; <<
7949 struct sctp_udpencaps encap; <<
7950 struct sctp_transport *t; <<
7951 __be16 encap_port; <<
7952 <<
7953 if (len < sizeof(encap)) <<
7954 return -EINVAL; <<
7955 <<
7956 len = sizeof(encap); <<
7957 if (copy_from_user(&encap, optval, le <<
7958 return -EFAULT; <<
7959 <<
7960 /* If an address other than INADDR_AN <<
7961 * no transport is found, then the re <<
7962 */ <<
7963 if (!sctp_is_any(sk, (union sctp_addr <<
7964 t = sctp_addr_id2transport(sk <<
7965 en <<
7966 if (!t) { <<
7967 pr_debug("%s: failed <<
7968 return -EINVAL; <<
7969 } <<
7970 <<
7971 encap_port = t->encap_port; <<
7972 goto out; <<
7973 } <<
7974 <<
7975 /* Get association, if assoc_id != SC <<
7976 * socket is a one to many style sock <<
7977 * was not found, then the id was inv <<
7978 */ <<
7979 asoc = sctp_id2assoc(sk, encap.sue_as <<
7980 if (!asoc && encap.sue_assoc_id != SC <<
7981 sctp_style(sk, UDP)) { <<
7982 pr_debug("%s: failed no assoc <<
7983 return -EINVAL; <<
7984 } <<
7985 <<
7986 if (asoc) { <<
7987 encap_port = asoc->encap_port <<
7988 goto out; <<
7989 } <<
7990 <<
7991 encap_port = sctp_sk(sk)->encap_port; <<
7992 <<
7993 out: <<
7994 encap.sue_port = (__force uint16_t)en <<
7995 if (copy_to_user(optval, &encap, len) <<
7996 return -EFAULT; <<
7997 <<
7998 if (put_user(len, optlen)) <<
7999 return -EFAULT; <<
8000 <<
8001 return 0; <<
8002 } <<
8003 <<
8004 static int sctp_getsockopt_probe_interval(str <<
8005 cha <<
8006 int <<
8007 { <<
8008 struct sctp_probeinterval params; <<
8009 struct sctp_association *asoc; <<
8010 struct sctp_transport *t; <<
8011 __u32 probe_interval; <<
8012 <<
8013 if (len < sizeof(params)) <<
8014 return -EINVAL; <<
8015 <<
8016 len = sizeof(params); <<
8017 if (copy_from_user(¶ms, optval, l <<
8018 return -EFAULT; <<
8019 <<
8020 /* If an address other than INADDR_AN <<
8021 * no transport is found, then the re <<
8022 */ <<
8023 if (!sctp_is_any(sk, (union sctp_addr <<
8024 t = sctp_addr_id2transport(sk <<
8025 pa <<
8026 if (!t) { <<
8027 pr_debug("%s: failed <<
8028 return -EINVAL; <<
8029 } <<
8030 <<
8031 probe_interval = jiffies_to_m <<
8032 goto out; <<
8033 } <<
8034 <<
8035 /* Get association, if assoc_id != SC <<
8036 * socket is a one to many style sock <<
8037 * was not found, then the id was inv <<
8038 */ <<
8039 asoc = sctp_id2assoc(sk, params.spi_a <<
8040 if (!asoc && params.spi_assoc_id != S <<
8041 sctp_style(sk, UDP)) { <<
8042 pr_debug("%s: failed no assoc <<
8043 return -EINVAL; <<
8044 } <<
8045 <<
8046 if (asoc) { <<
8047 probe_interval = jiffies_to_m <<
8048 goto out; <<
8049 } <<
8050 <<
8051 probe_interval = sctp_sk(sk)->probe_i <<
8052 <<
8053 out: <<
8054 params.spi_interval = probe_interval; <<
8055 if (copy_to_user(optval, ¶ms, len <<
8056 return -EFAULT; <<
8057 <<
8058 if (put_user(len, optlen)) <<
8059 return -EFAULT; <<
8060 <<
8061 return 0; <<
8062 } <<
8063 <<
8064 static int sctp_getsockopt(struct sock *sk, i 8023 static int sctp_getsockopt(struct sock *sk, int level, int optname,
8065 char __user *optva 8024 char __user *optval, int __user *optlen)
8066 { 8025 {
8067 int retval = 0; 8026 int retval = 0;
8068 int len; 8027 int len;
8069 8028
8070 pr_debug("%s: sk:%p, optname:%d\n", _ 8029 pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
8071 8030
8072 /* I can hardly begin to describe how 8031 /* I can hardly begin to describe how wrong this is. This is
8073 * so broken as to be worse than usel 8032 * so broken as to be worse than useless. The API draft
8074 * REALLY is NOT helpful here... I a 8033 * REALLY is NOT helpful here... I am not convinced that the
8075 * semantics of getsockopt() with a l 8034 * semantics of getsockopt() with a level OTHER THAN SOL_SCTP
8076 * are at all well-founded. 8035 * are at all well-founded.
8077 */ 8036 */
8078 if (level != SOL_SCTP) { 8037 if (level != SOL_SCTP) {
8079 struct sctp_af *af = sctp_sk( 8038 struct sctp_af *af = sctp_sk(sk)->pf->af;
8080 8039
8081 retval = af->getsockopt(sk, l 8040 retval = af->getsockopt(sk, level, optname, optval, optlen);
8082 return retval; 8041 return retval;
8083 } 8042 }
8084 8043
8085 if (get_user(len, optlen)) 8044 if (get_user(len, optlen))
8086 return -EFAULT; 8045 return -EFAULT;
8087 8046
8088 if (len < 0) 8047 if (len < 0)
8089 return -EINVAL; 8048 return -EINVAL;
8090 8049
8091 lock_sock(sk); 8050 lock_sock(sk);
8092 8051
8093 switch (optname) { 8052 switch (optname) {
8094 case SCTP_STATUS: 8053 case SCTP_STATUS:
8095 retval = sctp_getsockopt_sctp 8054 retval = sctp_getsockopt_sctp_status(sk, len, optval, optlen);
8096 break; 8055 break;
8097 case SCTP_DISABLE_FRAGMENTS: 8056 case SCTP_DISABLE_FRAGMENTS:
8098 retval = sctp_getsockopt_disa 8057 retval = sctp_getsockopt_disable_fragments(sk, len, optval,
8099 8058 optlen);
8100 break; 8059 break;
8101 case SCTP_EVENTS: 8060 case SCTP_EVENTS:
8102 retval = sctp_getsockopt_even 8061 retval = sctp_getsockopt_events(sk, len, optval, optlen);
8103 break; 8062 break;
8104 case SCTP_AUTOCLOSE: 8063 case SCTP_AUTOCLOSE:
8105 retval = sctp_getsockopt_auto 8064 retval = sctp_getsockopt_autoclose(sk, len, optval, optlen);
8106 break; 8065 break;
8107 case SCTP_SOCKOPT_PEELOFF: 8066 case SCTP_SOCKOPT_PEELOFF:
8108 retval = sctp_getsockopt_peel 8067 retval = sctp_getsockopt_peeloff(sk, len, optval, optlen);
8109 break; 8068 break;
8110 case SCTP_SOCKOPT_PEELOFF_FLAGS: 8069 case SCTP_SOCKOPT_PEELOFF_FLAGS:
8111 retval = sctp_getsockopt_peel 8070 retval = sctp_getsockopt_peeloff_flags(sk, len, optval, optlen);
8112 break; 8071 break;
8113 case SCTP_PEER_ADDR_PARAMS: 8072 case SCTP_PEER_ADDR_PARAMS:
8114 retval = sctp_getsockopt_peer 8073 retval = sctp_getsockopt_peer_addr_params(sk, len, optval,
8115 8074 optlen);
8116 break; 8075 break;
8117 case SCTP_DELAYED_SACK: 8076 case SCTP_DELAYED_SACK:
8118 retval = sctp_getsockopt_dela 8077 retval = sctp_getsockopt_delayed_ack(sk, len, optval,
8119 8078 optlen);
8120 break; 8079 break;
8121 case SCTP_INITMSG: 8080 case SCTP_INITMSG:
8122 retval = sctp_getsockopt_init 8081 retval = sctp_getsockopt_initmsg(sk, len, optval, optlen);
8123 break; 8082 break;
8124 case SCTP_GET_PEER_ADDRS: 8083 case SCTP_GET_PEER_ADDRS:
8125 retval = sctp_getsockopt_peer 8084 retval = sctp_getsockopt_peer_addrs(sk, len, optval,
8126 8085 optlen);
8127 break; 8086 break;
8128 case SCTP_GET_LOCAL_ADDRS: 8087 case SCTP_GET_LOCAL_ADDRS:
8129 retval = sctp_getsockopt_loca 8088 retval = sctp_getsockopt_local_addrs(sk, len, optval,
8130 8089 optlen);
8131 break; 8090 break;
8132 case SCTP_SOCKOPT_CONNECTX3: 8091 case SCTP_SOCKOPT_CONNECTX3:
8133 retval = sctp_getsockopt_conn 8092 retval = sctp_getsockopt_connectx3(sk, len, optval, optlen);
8134 break; 8093 break;
8135 case SCTP_DEFAULT_SEND_PARAM: 8094 case SCTP_DEFAULT_SEND_PARAM:
8136 retval = sctp_getsockopt_defa 8095 retval = sctp_getsockopt_default_send_param(sk, len,
8137 8096 optval, optlen);
8138 break; 8097 break;
8139 case SCTP_DEFAULT_SNDINFO: 8098 case SCTP_DEFAULT_SNDINFO:
8140 retval = sctp_getsockopt_defa 8099 retval = sctp_getsockopt_default_sndinfo(sk, len,
8141 8100 optval, optlen);
8142 break; 8101 break;
8143 case SCTP_PRIMARY_ADDR: 8102 case SCTP_PRIMARY_ADDR:
8144 retval = sctp_getsockopt_prim 8103 retval = sctp_getsockopt_primary_addr(sk, len, optval, optlen);
8145 break; 8104 break;
8146 case SCTP_NODELAY: 8105 case SCTP_NODELAY:
8147 retval = sctp_getsockopt_node 8106 retval = sctp_getsockopt_nodelay(sk, len, optval, optlen);
8148 break; 8107 break;
8149 case SCTP_RTOINFO: 8108 case SCTP_RTOINFO:
8150 retval = sctp_getsockopt_rtoi 8109 retval = sctp_getsockopt_rtoinfo(sk, len, optval, optlen);
8151 break; 8110 break;
8152 case SCTP_ASSOCINFO: 8111 case SCTP_ASSOCINFO:
8153 retval = sctp_getsockopt_asso 8112 retval = sctp_getsockopt_associnfo(sk, len, optval, optlen);
8154 break; 8113 break;
8155 case SCTP_I_WANT_MAPPED_V4_ADDR: 8114 case SCTP_I_WANT_MAPPED_V4_ADDR:
8156 retval = sctp_getsockopt_mapp 8115 retval = sctp_getsockopt_mappedv4(sk, len, optval, optlen);
8157 break; 8116 break;
8158 case SCTP_MAXSEG: 8117 case SCTP_MAXSEG:
8159 retval = sctp_getsockopt_maxs 8118 retval = sctp_getsockopt_maxseg(sk, len, optval, optlen);
8160 break; 8119 break;
8161 case SCTP_GET_PEER_ADDR_INFO: 8120 case SCTP_GET_PEER_ADDR_INFO:
8162 retval = sctp_getsockopt_peer 8121 retval = sctp_getsockopt_peer_addr_info(sk, len, optval,
8163 8122 optlen);
8164 break; 8123 break;
8165 case SCTP_ADAPTATION_LAYER: 8124 case SCTP_ADAPTATION_LAYER:
8166 retval = sctp_getsockopt_adap 8125 retval = sctp_getsockopt_adaptation_layer(sk, len, optval,
8167 8126 optlen);
8168 break; 8127 break;
8169 case SCTP_CONTEXT: 8128 case SCTP_CONTEXT:
8170 retval = sctp_getsockopt_cont 8129 retval = sctp_getsockopt_context(sk, len, optval, optlen);
8171 break; 8130 break;
8172 case SCTP_FRAGMENT_INTERLEAVE: 8131 case SCTP_FRAGMENT_INTERLEAVE:
8173 retval = sctp_getsockopt_frag 8132 retval = sctp_getsockopt_fragment_interleave(sk, len, optval,
8174 8133 optlen);
8175 break; 8134 break;
8176 case SCTP_PARTIAL_DELIVERY_POINT: 8135 case SCTP_PARTIAL_DELIVERY_POINT:
8177 retval = sctp_getsockopt_part 8136 retval = sctp_getsockopt_partial_delivery_point(sk, len, optval,
8178 8137 optlen);
8179 break; 8138 break;
8180 case SCTP_MAX_BURST: 8139 case SCTP_MAX_BURST:
8181 retval = sctp_getsockopt_maxb 8140 retval = sctp_getsockopt_maxburst(sk, len, optval, optlen);
8182 break; 8141 break;
8183 case SCTP_AUTH_KEY: 8142 case SCTP_AUTH_KEY:
8184 case SCTP_AUTH_CHUNK: 8143 case SCTP_AUTH_CHUNK:
8185 case SCTP_AUTH_DELETE_KEY: 8144 case SCTP_AUTH_DELETE_KEY:
8186 case SCTP_AUTH_DEACTIVATE_KEY: 8145 case SCTP_AUTH_DEACTIVATE_KEY:
8187 retval = -EOPNOTSUPP; 8146 retval = -EOPNOTSUPP;
8188 break; 8147 break;
8189 case SCTP_HMAC_IDENT: 8148 case SCTP_HMAC_IDENT:
8190 retval = sctp_getsockopt_hmac 8149 retval = sctp_getsockopt_hmac_ident(sk, len, optval, optlen);
8191 break; 8150 break;
8192 case SCTP_AUTH_ACTIVE_KEY: 8151 case SCTP_AUTH_ACTIVE_KEY:
8193 retval = sctp_getsockopt_acti 8152 retval = sctp_getsockopt_active_key(sk, len, optval, optlen);
8194 break; 8153 break;
8195 case SCTP_PEER_AUTH_CHUNKS: 8154 case SCTP_PEER_AUTH_CHUNKS:
8196 retval = sctp_getsockopt_peer 8155 retval = sctp_getsockopt_peer_auth_chunks(sk, len, optval,
8197 8156 optlen);
8198 break; 8157 break;
8199 case SCTP_LOCAL_AUTH_CHUNKS: 8158 case SCTP_LOCAL_AUTH_CHUNKS:
8200 retval = sctp_getsockopt_loca 8159 retval = sctp_getsockopt_local_auth_chunks(sk, len, optval,
8201 8160 optlen);
8202 break; 8161 break;
8203 case SCTP_GET_ASSOC_NUMBER: 8162 case SCTP_GET_ASSOC_NUMBER:
8204 retval = sctp_getsockopt_asso 8163 retval = sctp_getsockopt_assoc_number(sk, len, optval, optlen);
8205 break; 8164 break;
8206 case SCTP_GET_ASSOC_ID_LIST: 8165 case SCTP_GET_ASSOC_ID_LIST:
8207 retval = sctp_getsockopt_asso 8166 retval = sctp_getsockopt_assoc_ids(sk, len, optval, optlen);
8208 break; 8167 break;
8209 case SCTP_AUTO_ASCONF: 8168 case SCTP_AUTO_ASCONF:
8210 retval = sctp_getsockopt_auto 8169 retval = sctp_getsockopt_auto_asconf(sk, len, optval, optlen);
8211 break; 8170 break;
8212 case SCTP_PEER_ADDR_THLDS: 8171 case SCTP_PEER_ADDR_THLDS:
8213 retval = sctp_getsockopt_padd 8172 retval = sctp_getsockopt_paddr_thresholds(sk, optval, len,
8214 8173 optlen, false);
8215 break; 8174 break;
8216 case SCTP_PEER_ADDR_THLDS_V2: 8175 case SCTP_PEER_ADDR_THLDS_V2:
8217 retval = sctp_getsockopt_padd 8176 retval = sctp_getsockopt_paddr_thresholds(sk, optval, len,
8218 8177 optlen, true);
8219 break; 8178 break;
8220 case SCTP_GET_ASSOC_STATS: 8179 case SCTP_GET_ASSOC_STATS:
8221 retval = sctp_getsockopt_asso 8180 retval = sctp_getsockopt_assoc_stats(sk, len, optval, optlen);
8222 break; 8181 break;
8223 case SCTP_RECVRCVINFO: 8182 case SCTP_RECVRCVINFO:
8224 retval = sctp_getsockopt_recv 8183 retval = sctp_getsockopt_recvrcvinfo(sk, len, optval, optlen);
8225 break; 8184 break;
8226 case SCTP_RECVNXTINFO: 8185 case SCTP_RECVNXTINFO:
8227 retval = sctp_getsockopt_recv 8186 retval = sctp_getsockopt_recvnxtinfo(sk, len, optval, optlen);
8228 break; 8187 break;
8229 case SCTP_PR_SUPPORTED: 8188 case SCTP_PR_SUPPORTED:
8230 retval = sctp_getsockopt_pr_s 8189 retval = sctp_getsockopt_pr_supported(sk, len, optval, optlen);
8231 break; 8190 break;
8232 case SCTP_DEFAULT_PRINFO: 8191 case SCTP_DEFAULT_PRINFO:
8233 retval = sctp_getsockopt_defa 8192 retval = sctp_getsockopt_default_prinfo(sk, len, optval,
8234 8193 optlen);
8235 break; 8194 break;
8236 case SCTP_PR_ASSOC_STATUS: 8195 case SCTP_PR_ASSOC_STATUS:
8237 retval = sctp_getsockopt_pr_a 8196 retval = sctp_getsockopt_pr_assocstatus(sk, len, optval,
8238 8197 optlen);
8239 break; 8198 break;
8240 case SCTP_PR_STREAM_STATUS: 8199 case SCTP_PR_STREAM_STATUS:
8241 retval = sctp_getsockopt_pr_s 8200 retval = sctp_getsockopt_pr_streamstatus(sk, len, optval,
8242 8201 optlen);
8243 break; 8202 break;
8244 case SCTP_RECONFIG_SUPPORTED: 8203 case SCTP_RECONFIG_SUPPORTED:
8245 retval = sctp_getsockopt_reco 8204 retval = sctp_getsockopt_reconfig_supported(sk, len, optval,
8246 8205 optlen);
8247 break; 8206 break;
8248 case SCTP_ENABLE_STREAM_RESET: 8207 case SCTP_ENABLE_STREAM_RESET:
8249 retval = sctp_getsockopt_enab 8208 retval = sctp_getsockopt_enable_strreset(sk, len, optval,
8250 8209 optlen);
8251 break; 8210 break;
8252 case SCTP_STREAM_SCHEDULER: 8211 case SCTP_STREAM_SCHEDULER:
8253 retval = sctp_getsockopt_sche 8212 retval = sctp_getsockopt_scheduler(sk, len, optval,
8254 8213 optlen);
8255 break; 8214 break;
8256 case SCTP_STREAM_SCHEDULER_VALUE: 8215 case SCTP_STREAM_SCHEDULER_VALUE:
8257 retval = sctp_getsockopt_sche 8216 retval = sctp_getsockopt_scheduler_value(sk, len, optval,
8258 8217 optlen);
8259 break; 8218 break;
8260 case SCTP_INTERLEAVING_SUPPORTED: 8219 case SCTP_INTERLEAVING_SUPPORTED:
8261 retval = sctp_getsockopt_inte 8220 retval = sctp_getsockopt_interleaving_supported(sk, len, optval,
8262 8221 optlen);
8263 break; 8222 break;
8264 case SCTP_REUSE_PORT: 8223 case SCTP_REUSE_PORT:
8265 retval = sctp_getsockopt_reus 8224 retval = sctp_getsockopt_reuse_port(sk, len, optval, optlen);
8266 break; 8225 break;
8267 case SCTP_EVENT: 8226 case SCTP_EVENT:
8268 retval = sctp_getsockopt_even 8227 retval = sctp_getsockopt_event(sk, len, optval, optlen);
8269 break; 8228 break;
8270 case SCTP_ASCONF_SUPPORTED: 8229 case SCTP_ASCONF_SUPPORTED:
8271 retval = sctp_getsockopt_asco 8230 retval = sctp_getsockopt_asconf_supported(sk, len, optval,
8272 8231 optlen);
8273 break; 8232 break;
8274 case SCTP_AUTH_SUPPORTED: 8233 case SCTP_AUTH_SUPPORTED:
8275 retval = sctp_getsockopt_auth 8234 retval = sctp_getsockopt_auth_supported(sk, len, optval,
8276 8235 optlen);
8277 break; 8236 break;
8278 case SCTP_ECN_SUPPORTED: 8237 case SCTP_ECN_SUPPORTED:
8279 retval = sctp_getsockopt_ecn_ 8238 retval = sctp_getsockopt_ecn_supported(sk, len, optval, optlen);
8280 break; 8239 break;
8281 case SCTP_EXPOSE_POTENTIALLY_FAILED_S 8240 case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
8282 retval = sctp_getsockopt_pf_e 8241 retval = sctp_getsockopt_pf_expose(sk, len, optval, optlen);
8283 break; 8242 break;
8284 case SCTP_REMOTE_UDP_ENCAPS_PORT: <<
8285 retval = sctp_getsockopt_enca <<
8286 break; <<
8287 case SCTP_PLPMTUD_PROBE_INTERVAL: <<
8288 retval = sctp_getsockopt_prob <<
8289 break; <<
8290 default: 8243 default:
8291 retval = -ENOPROTOOPT; 8244 retval = -ENOPROTOOPT;
8292 break; 8245 break;
8293 } 8246 }
8294 8247
8295 release_sock(sk); 8248 release_sock(sk);
8296 return retval; 8249 return retval;
8297 } 8250 }
8298 8251
8299 static bool sctp_bpf_bypass_getsockopt(int le <<
8300 { <<
8301 if (level == SOL_SCTP) { <<
8302 switch (optname) { <<
8303 case SCTP_SOCKOPT_PEELOFF: <<
8304 case SCTP_SOCKOPT_PEELOFF_FLA <<
8305 case SCTP_SOCKOPT_CONNECTX3: <<
8306 return true; <<
8307 default: <<
8308 return false; <<
8309 } <<
8310 } <<
8311 <<
8312 return false; <<
8313 } <<
8314 <<
8315 static int sctp_hash(struct sock *sk) 8252 static int sctp_hash(struct sock *sk)
8316 { 8253 {
8317 /* STUB */ 8254 /* STUB */
8318 return 0; 8255 return 0;
8319 } 8256 }
8320 8257
8321 static void sctp_unhash(struct sock *sk) 8258 static void sctp_unhash(struct sock *sk)
8322 { 8259 {
8323 /* STUB */ 8260 /* STUB */
8324 } 8261 }
8325 8262
8326 /* Check if port is acceptable. Possibly fin 8263 /* Check if port is acceptable. Possibly find first available port.
8327 * 8264 *
8328 * The port hash table (contained in the 'glo 8265 * The port hash table (contained in the 'global' SCTP protocol storage
8329 * returned by struct sctp_protocol *sctp_get 8266 * returned by struct sctp_protocol *sctp_get_protocol()). The hash
8330 * table is an array of 4096 lists (sctp_bind 8267 * table is an array of 4096 lists (sctp_bind_hashbucket). Each
8331 * list (the list number is the port number h 8268 * list (the list number is the port number hashed out, so as you
8332 * would expect from a hash function, all the 8269 * would expect from a hash function, all the ports in a given list have
8333 * such a number that hashes out to the same 8270 * such a number that hashes out to the same list number; you were
8334 * expecting that, right?); so each list has 8271 * expecting that, right?); so each list has a set of ports, with a
8335 * link to the socket (struct sock) that uses 8272 * link to the socket (struct sock) that uses it, the port number and
8336 * a fastreuse flag (FIXME: NPI ipg). 8273 * a fastreuse flag (FIXME: NPI ipg).
8337 */ 8274 */
8338 static struct sctp_bind_bucket *sctp_bucket_c 8275 static struct sctp_bind_bucket *sctp_bucket_create(
8339 struct sctp_bind_hashbucket *head, st 8276 struct sctp_bind_hashbucket *head, struct net *, unsigned short snum);
8340 8277
8341 static int sctp_get_port_local(struct sock *s 8278 static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
8342 { 8279 {
8343 struct sctp_sock *sp = sctp_sk(sk); 8280 struct sctp_sock *sp = sctp_sk(sk);
8344 bool reuse = (sk->sk_reuse || sp->reu 8281 bool reuse = (sk->sk_reuse || sp->reuse);
8345 struct sctp_bind_hashbucket *head; /* 8282 struct sctp_bind_hashbucket *head; /* hash list */
8346 struct net *net = sock_net(sk); 8283 struct net *net = sock_net(sk);
8347 kuid_t uid = sock_i_uid(sk); 8284 kuid_t uid = sock_i_uid(sk);
8348 struct sctp_bind_bucket *pp; 8285 struct sctp_bind_bucket *pp;
8349 unsigned short snum; 8286 unsigned short snum;
8350 int ret; 8287 int ret;
8351 8288
8352 snum = ntohs(addr->v4.sin_port); 8289 snum = ntohs(addr->v4.sin_port);
8353 8290
8354 pr_debug("%s: begins, snum:%d\n", __f 8291 pr_debug("%s: begins, snum:%d\n", __func__, snum);
8355 8292
>> 8293 local_bh_disable();
>> 8294
8356 if (snum == 0) { 8295 if (snum == 0) {
8357 /* Search for an available po 8296 /* Search for an available port. */
8358 int low, high, remaining, ind 8297 int low, high, remaining, index;
8359 unsigned int rover; 8298 unsigned int rover;
8360 8299
8361 inet_sk_get_local_port_range( !! 8300 inet_get_local_port_range(net, &low, &high);
8362 remaining = (high - low) + 1; 8301 remaining = (high - low) + 1;
8363 rover = get_random_u32_below( !! 8302 rover = prandom_u32() % remaining + low;
8364 8303
8365 do { 8304 do {
8366 rover++; 8305 rover++;
8367 if ((rover < low) || 8306 if ((rover < low) || (rover > high))
8368 rover = low; 8307 rover = low;
8369 if (inet_is_local_res 8308 if (inet_is_local_reserved_port(net, rover))
8370 continue; 8309 continue;
8371 index = sctp_phashfn( 8310 index = sctp_phashfn(net, rover);
8372 head = &sctp_port_has 8311 head = &sctp_port_hashtable[index];
8373 spin_lock_bh(&head->l !! 8312 spin_lock(&head->lock);
8374 sctp_for_each_hentry( 8313 sctp_for_each_hentry(pp, &head->chain)
8375 if ((pp->port 8314 if ((pp->port == rover) &&
8376 net_eq(ne 8315 net_eq(net, pp->net))
8377 goto 8316 goto next;
8378 break; 8317 break;
8379 next: 8318 next:
8380 spin_unlock_bh(&head- !! 8319 spin_unlock(&head->lock);
8381 cond_resched(); <<
8382 } while (--remaining > 0); 8320 } while (--remaining > 0);
8383 8321
8384 /* Exhausted local port range 8322 /* Exhausted local port range during search? */
8385 ret = 1; 8323 ret = 1;
8386 if (remaining <= 0) 8324 if (remaining <= 0)
8387 return ret; !! 8325 goto fail;
8388 8326
8389 /* OK, here is the one we wil 8327 /* OK, here is the one we will use. HEAD (the port
8390 * hash table list entry) is 8328 * hash table list entry) is non-NULL and we hold it's
8391 * mutex. 8329 * mutex.
8392 */ 8330 */
8393 snum = rover; 8331 snum = rover;
8394 } else { 8332 } else {
8395 /* We are given an specific p 8333 /* We are given an specific port number; we verify
8396 * that it is not being used. 8334 * that it is not being used. If it is used, we will
8397 * exahust the search in the 8335 * exahust the search in the hash list corresponding
8398 * to the port number (snum) 8336 * to the port number (snum) - we detect that with the
8399 * port iterator, pp being NU 8337 * port iterator, pp being NULL.
8400 */ 8338 */
8401 head = &sctp_port_hashtable[s 8339 head = &sctp_port_hashtable[sctp_phashfn(net, snum)];
8402 spin_lock_bh(&head->lock); !! 8340 spin_lock(&head->lock);
8403 sctp_for_each_hentry(pp, &hea 8341 sctp_for_each_hentry(pp, &head->chain) {
8404 if ((pp->port == snum 8342 if ((pp->port == snum) && net_eq(pp->net, net))
8405 goto pp_found 8343 goto pp_found;
8406 } 8344 }
8407 } 8345 }
8408 pp = NULL; 8346 pp = NULL;
8409 goto pp_not_found; 8347 goto pp_not_found;
8410 pp_found: 8348 pp_found:
8411 if (!hlist_empty(&pp->owner)) { 8349 if (!hlist_empty(&pp->owner)) {
8412 /* We had a port hash table h 8350 /* We had a port hash table hit - there is an
8413 * available port (pp != NULL 8351 * available port (pp != NULL) and it is being
8414 * used by other socket (pp-> 8352 * used by other socket (pp->owner not empty); that other
8415 * socket is going to be sk2. 8353 * socket is going to be sk2.
8416 */ 8354 */
8417 struct sock *sk2; 8355 struct sock *sk2;
8418 8356
8419 pr_debug("%s: found a possibl 8357 pr_debug("%s: found a possible match\n", __func__);
8420 8358
8421 if ((pp->fastreuse && reuse & 8359 if ((pp->fastreuse && reuse &&
8422 sk->sk_state != SCTP_SS_ 8360 sk->sk_state != SCTP_SS_LISTENING) ||
8423 (pp->fastreuseport && sk- 8361 (pp->fastreuseport && sk->sk_reuseport &&
8424 uid_eq(pp->fastuid, uid) 8362 uid_eq(pp->fastuid, uid)))
8425 goto success; 8363 goto success;
8426 8364
8427 /* Run through the list of so 8365 /* Run through the list of sockets bound to the port
8428 * (pp->port) [via the pointe 8366 * (pp->port) [via the pointers bind_next and
8429 * bind_pprev in the struct s 8367 * bind_pprev in the struct sock *sk2 (pp->sk)]. On each one,
8430 * we get the endpoint they d 8368 * we get the endpoint they describe and run through
8431 * the endpoint's list of IP 8369 * the endpoint's list of IP (v4 or v6) addresses,
8432 * comparing each of the addr 8370 * comparing each of the addresses with the address of
8433 * the socket sk. If we find 8371 * the socket sk. If we find a match, then that means
8434 * that this port/socket (sk) 8372 * that this port/socket (sk) combination are already
8435 * in an endpoint. 8373 * in an endpoint.
8436 */ 8374 */
8437 sk_for_each_bound(sk2, &pp->o 8375 sk_for_each_bound(sk2, &pp->owner) {
8438 int bound_dev_if2 = R <<
8439 struct sctp_sock *sp2 8376 struct sctp_sock *sp2 = sctp_sk(sk2);
8440 struct sctp_endpoint 8377 struct sctp_endpoint *ep2 = sp2->ep;
8441 8378
8442 if (sk == sk2 || 8379 if (sk == sk2 ||
8443 (reuse && (sk2->s 8380 (reuse && (sk2->sk_reuse || sp2->reuse) &&
8444 sk2->sk_state != 8381 sk2->sk_state != SCTP_SS_LISTENING) ||
8445 (sk->sk_reuseport 8382 (sk->sk_reuseport && sk2->sk_reuseport &&
8446 uid_eq(uid, sock 8383 uid_eq(uid, sock_i_uid(sk2))))
8447 continue; 8384 continue;
8448 8385
8449 if ((!sk->sk_bound_de !! 8386 if (sctp_bind_addr_conflict(&ep2->base.bind_addr,
8450 sk->sk_bound_dev <<
8451 sctp_bind_addr_co <<
8452 8387 addr, sp2, sp)) {
8453 ret = 1; 8388 ret = 1;
8454 goto fail_unl 8389 goto fail_unlock;
8455 } 8390 }
8456 } 8391 }
8457 8392
8458 pr_debug("%s: found a match\n 8393 pr_debug("%s: found a match\n", __func__);
8459 } 8394 }
8460 pp_not_found: 8395 pp_not_found:
8461 /* If there was a hash table miss, cr 8396 /* If there was a hash table miss, create a new port. */
8462 ret = 1; 8397 ret = 1;
8463 if (!pp && !(pp = sctp_bucket_create( 8398 if (!pp && !(pp = sctp_bucket_create(head, net, snum)))
8464 goto fail_unlock; 8399 goto fail_unlock;
8465 8400
8466 /* In either case (hit or miss), make 8401 /* In either case (hit or miss), make sure fastreuse is 1 only
8467 * if sk->sk_reuse is too (that is, i 8402 * if sk->sk_reuse is too (that is, if the caller requested
8468 * SO_REUSEADDR on this socket -sk-). 8403 * SO_REUSEADDR on this socket -sk-).
8469 */ 8404 */
8470 if (hlist_empty(&pp->owner)) { 8405 if (hlist_empty(&pp->owner)) {
8471 if (reuse && sk->sk_state != 8406 if (reuse && sk->sk_state != SCTP_SS_LISTENING)
8472 pp->fastreuse = 1; 8407 pp->fastreuse = 1;
8473 else 8408 else
8474 pp->fastreuse = 0; 8409 pp->fastreuse = 0;
8475 8410
8476 if (sk->sk_reuseport) { 8411 if (sk->sk_reuseport) {
8477 pp->fastreuseport = 1 8412 pp->fastreuseport = 1;
8478 pp->fastuid = uid; 8413 pp->fastuid = uid;
8479 } else { 8414 } else {
8480 pp->fastreuseport = 0 8415 pp->fastreuseport = 0;
8481 } 8416 }
8482 } else { 8417 } else {
8483 if (pp->fastreuse && 8418 if (pp->fastreuse &&
8484 (!reuse || sk->sk_state = 8419 (!reuse || sk->sk_state == SCTP_SS_LISTENING))
8485 pp->fastreuse = 0; 8420 pp->fastreuse = 0;
8486 8421
8487 if (pp->fastreuseport && 8422 if (pp->fastreuseport &&
8488 (!sk->sk_reuseport || !ui 8423 (!sk->sk_reuseport || !uid_eq(pp->fastuid, uid)))
8489 pp->fastreuseport = 0 8424 pp->fastreuseport = 0;
8490 } 8425 }
8491 8426
8492 /* We are set, so fill up all the dat 8427 /* We are set, so fill up all the data in the hash table
8493 * entry, tie the socket list informa 8428 * entry, tie the socket list information with the rest of the
8494 * sockets FIXME: Blurry, NPI (ipg). 8429 * sockets FIXME: Blurry, NPI (ipg).
8495 */ 8430 */
8496 success: 8431 success:
8497 if (!sp->bind_hash) { 8432 if (!sp->bind_hash) {
8498 inet_sk(sk)->inet_num = snum; 8433 inet_sk(sk)->inet_num = snum;
8499 sk_add_bind_node(sk, &pp->own 8434 sk_add_bind_node(sk, &pp->owner);
8500 sp->bind_hash = pp; 8435 sp->bind_hash = pp;
8501 } 8436 }
8502 ret = 0; 8437 ret = 0;
8503 8438
8504 fail_unlock: 8439 fail_unlock:
8505 spin_unlock_bh(&head->lock); !! 8440 spin_unlock(&head->lock);
>> 8441
>> 8442 fail:
>> 8443 local_bh_enable();
8506 return ret; 8444 return ret;
8507 } 8445 }
8508 8446
8509 /* Assign a 'snum' port to the socket. If sn 8447 /* Assign a 'snum' port to the socket. If snum == 0, an ephemeral
8510 * port is requested. 8448 * port is requested.
8511 */ 8449 */
8512 static int sctp_get_port(struct sock *sk, uns 8450 static int sctp_get_port(struct sock *sk, unsigned short snum)
8513 { 8451 {
8514 union sctp_addr addr; 8452 union sctp_addr addr;
8515 struct sctp_af *af = sctp_sk(sk)->pf- 8453 struct sctp_af *af = sctp_sk(sk)->pf->af;
8516 8454
8517 /* Set up a dummy address struct from 8455 /* Set up a dummy address struct from the sk. */
8518 af->from_sk(&addr, sk); 8456 af->from_sk(&addr, sk);
8519 addr.v4.sin_port = htons(snum); 8457 addr.v4.sin_port = htons(snum);
8520 8458
8521 /* Note: sk->sk_num gets filled in if 8459 /* Note: sk->sk_num gets filled in if ephemeral port request. */
8522 return sctp_get_port_local(sk, &addr) 8460 return sctp_get_port_local(sk, &addr);
8523 } 8461 }
8524 8462
8525 /* 8463 /*
8526 * Move a socket to LISTENING state. 8464 * Move a socket to LISTENING state.
8527 */ 8465 */
8528 static int sctp_listen_start(struct sock *sk, 8466 static int sctp_listen_start(struct sock *sk, int backlog)
8529 { 8467 {
8530 struct sctp_sock *sp = sctp_sk(sk); 8468 struct sctp_sock *sp = sctp_sk(sk);
8531 struct sctp_endpoint *ep = sp->ep; 8469 struct sctp_endpoint *ep = sp->ep;
8532 struct crypto_shash *tfm = NULL; 8470 struct crypto_shash *tfm = NULL;
8533 char alg[32]; 8471 char alg[32];
8534 int err; <<
8535 8472
8536 /* Allocate HMAC for generating cooki 8473 /* Allocate HMAC for generating cookie. */
8537 if (!sp->hmac && sp->sctp_hmac_alg) { 8474 if (!sp->hmac && sp->sctp_hmac_alg) {
8538 sprintf(alg, "hmac(%s)", sp-> 8475 sprintf(alg, "hmac(%s)", sp->sctp_hmac_alg);
8539 tfm = crypto_alloc_shash(alg, 8476 tfm = crypto_alloc_shash(alg, 0, 0);
8540 if (IS_ERR(tfm)) { 8477 if (IS_ERR(tfm)) {
8541 net_info_ratelimited( 8478 net_info_ratelimited("failed to load transform for %s: %ld\n",
8542 8479 sp->sctp_hmac_alg, PTR_ERR(tfm));
8543 return -ENOSYS; 8480 return -ENOSYS;
8544 } 8481 }
8545 sctp_sk(sk)->hmac = tfm; 8482 sctp_sk(sk)->hmac = tfm;
8546 } 8483 }
8547 8484
8548 /* 8485 /*
8549 * If a bind() or sctp_bindx() is not 8486 * If a bind() or sctp_bindx() is not called prior to a listen()
8550 * call that allows new associations 8487 * call that allows new associations to be accepted, the system
8551 * picks an ephemeral port and will c 8488 * picks an ephemeral port and will choose an address set equivalent
8552 * to binding with a wildcard address 8489 * to binding with a wildcard address.
8553 * 8490 *
8554 * This is not currently spelled out 8491 * This is not currently spelled out in the SCTP sockets
8555 * extensions draft, but follows the 8492 * extensions draft, but follows the practice as seen in TCP
8556 * sockets. 8493 * sockets.
8557 * 8494 *
8558 */ 8495 */
8559 inet_sk_set_state(sk, SCTP_SS_LISTENI 8496 inet_sk_set_state(sk, SCTP_SS_LISTENING);
8560 if (!ep->base.bind_addr.port) { 8497 if (!ep->base.bind_addr.port) {
8561 if (sctp_autobind(sk)) { !! 8498 if (sctp_autobind(sk))
8562 err = -EAGAIN; !! 8499 return -EAGAIN;
8563 goto err; <<
8564 } <<
8565 } else { 8500 } else {
8566 if (sctp_get_port(sk, inet_sk 8501 if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
8567 err = -EADDRINUSE; !! 8502 inet_sk_set_state(sk, SCTP_SS_CLOSED);
8568 goto err; !! 8503 return -EADDRINUSE;
8569 } 8504 }
8570 } 8505 }
8571 8506
8572 WRITE_ONCE(sk->sk_max_ack_backlog, ba 8507 WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
8573 err = sctp_hash_endpoint(ep); !! 8508 return sctp_hash_endpoint(ep);
8574 if (err) <<
8575 goto err; <<
8576 <<
8577 return 0; <<
8578 err: <<
8579 inet_sk_set_state(sk, SCTP_SS_CLOSED) <<
8580 return err; <<
8581 } 8509 }
8582 8510
8583 /* 8511 /*
8584 * 4.1.3 / 5.1.3 listen() 8512 * 4.1.3 / 5.1.3 listen()
8585 * 8513 *
8586 * By default, new associations are not acc 8514 * By default, new associations are not accepted for UDP style sockets.
8587 * An application uses listen() to mark a s 8515 * An application uses listen() to mark a socket as being able to
8588 * accept new associations. 8516 * accept new associations.
8589 * 8517 *
8590 * On TCP style sockets, applications use l 8518 * On TCP style sockets, applications use listen() to ready the SCTP
8591 * endpoint for accepting inbound associati 8519 * endpoint for accepting inbound associations.
8592 * 8520 *
8593 * On both types of endpoints a backlog of 8521 * On both types of endpoints a backlog of '' disables listening.
8594 * 8522 *
8595 * Move a socket to LISTENING state. 8523 * Move a socket to LISTENING state.
8596 */ 8524 */
8597 int sctp_inet_listen(struct socket *sock, int 8525 int sctp_inet_listen(struct socket *sock, int backlog)
8598 { 8526 {
8599 struct sock *sk = sock->sk; 8527 struct sock *sk = sock->sk;
8600 struct sctp_endpoint *ep = sctp_sk(sk 8528 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
8601 int err = -EINVAL; 8529 int err = -EINVAL;
8602 8530
8603 if (unlikely(backlog < 0)) 8531 if (unlikely(backlog < 0))
8604 return err; 8532 return err;
8605 8533
8606 lock_sock(sk); 8534 lock_sock(sk);
8607 8535
8608 /* Peeled-off sockets are not allowed 8536 /* Peeled-off sockets are not allowed to listen(). */
8609 if (sctp_style(sk, UDP_HIGH_BANDWIDTH 8537 if (sctp_style(sk, UDP_HIGH_BANDWIDTH))
8610 goto out; 8538 goto out;
8611 8539
8612 if (sock->state != SS_UNCONNECTED) 8540 if (sock->state != SS_UNCONNECTED)
8613 goto out; 8541 goto out;
8614 8542
8615 if (!sctp_sstate(sk, LISTENING) && !s 8543 if (!sctp_sstate(sk, LISTENING) && !sctp_sstate(sk, CLOSED))
8616 goto out; 8544 goto out;
8617 8545
8618 /* If backlog is zero, disable listen 8546 /* If backlog is zero, disable listening. */
8619 if (!backlog) { 8547 if (!backlog) {
8620 if (sctp_sstate(sk, CLOSED)) 8548 if (sctp_sstate(sk, CLOSED))
8621 goto out; 8549 goto out;
8622 8550
8623 err = 0; 8551 err = 0;
8624 sctp_unhash_endpoint(ep); 8552 sctp_unhash_endpoint(ep);
8625 sk->sk_state = SCTP_SS_CLOSED 8553 sk->sk_state = SCTP_SS_CLOSED;
8626 if (sk->sk_reuse || sctp_sk(s 8554 if (sk->sk_reuse || sctp_sk(sk)->reuse)
8627 sctp_sk(sk)->bind_has 8555 sctp_sk(sk)->bind_hash->fastreuse = 1;
8628 goto out; 8556 goto out;
8629 } 8557 }
8630 8558
8631 /* If we are already listening, just 8559 /* If we are already listening, just update the backlog */
8632 if (sctp_sstate(sk, LISTENING)) 8560 if (sctp_sstate(sk, LISTENING))
8633 WRITE_ONCE(sk->sk_max_ack_bac 8561 WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
8634 else { 8562 else {
8635 err = sctp_listen_start(sk, b 8563 err = sctp_listen_start(sk, backlog);
8636 if (err) 8564 if (err)
8637 goto out; 8565 goto out;
8638 } 8566 }
8639 8567
8640 err = 0; 8568 err = 0;
8641 out: 8569 out:
8642 release_sock(sk); 8570 release_sock(sk);
8643 return err; 8571 return err;
8644 } 8572 }
8645 8573
8646 /* 8574 /*
8647 * This function is done by modeling the curr 8575 * This function is done by modeling the current datagram_poll() and the
8648 * tcp_poll(). Note that, based on these imp 8576 * tcp_poll(). Note that, based on these implementations, we don't
8649 * lock the socket in this function, even tho 8577 * lock the socket in this function, even though it seems that,
8650 * ideally, locking or some other mechanisms 8578 * ideally, locking or some other mechanisms can be used to ensure
8651 * the integrity of the counters (sndbuf and 8579 * the integrity of the counters (sndbuf and wmem_alloc) used
8652 * in this place. We assume that we don't ne 8580 * in this place. We assume that we don't need locks either until proven
8653 * otherwise. 8581 * otherwise.
8654 * 8582 *
8655 * Another thing to note is that we include t 8583 * Another thing to note is that we include the Async I/O support
8656 * here, again, by modeling the current TCP/U 8584 * here, again, by modeling the current TCP/UDP code. We don't have
8657 * a good way to test with it yet. 8585 * a good way to test with it yet.
8658 */ 8586 */
8659 __poll_t sctp_poll(struct file *file, struct 8587 __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
8660 { 8588 {
8661 struct sock *sk = sock->sk; 8589 struct sock *sk = sock->sk;
8662 struct sctp_sock *sp = sctp_sk(sk); 8590 struct sctp_sock *sp = sctp_sk(sk);
8663 __poll_t mask; 8591 __poll_t mask;
8664 8592
8665 poll_wait(file, sk_sleep(sk), wait); 8593 poll_wait(file, sk_sleep(sk), wait);
8666 8594
8667 sock_rps_record_flow(sk); 8595 sock_rps_record_flow(sk);
8668 8596
8669 /* A TCP-style listening socket becom 8597 /* A TCP-style listening socket becomes readable when the accept queue
8670 * is not empty. 8598 * is not empty.
8671 */ 8599 */
8672 if (sctp_style(sk, TCP) && sctp_sstat 8600 if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
8673 return (!list_empty(&sp->ep-> 8601 return (!list_empty(&sp->ep->asocs)) ?
8674 (EPOLLIN | EPOLLRDNOR 8602 (EPOLLIN | EPOLLRDNORM) : 0;
8675 8603
8676 mask = 0; 8604 mask = 0;
8677 8605
8678 /* Is there any exceptional events? 8606 /* Is there any exceptional events? */
8679 if (sk->sk_err || !skb_queue_empty_lo 8607 if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
8680 mask |= EPOLLERR | 8608 mask |= EPOLLERR |
8681 (sock_flag(sk, SOCK_S 8609 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
8682 if (sk->sk_shutdown & RCV_SHUTDOWN) 8610 if (sk->sk_shutdown & RCV_SHUTDOWN)
8683 mask |= EPOLLRDHUP | EPOLLIN 8611 mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
8684 if (sk->sk_shutdown == SHUTDOWN_MASK) 8612 if (sk->sk_shutdown == SHUTDOWN_MASK)
8685 mask |= EPOLLHUP; 8613 mask |= EPOLLHUP;
8686 8614
8687 /* Is it readable? Reconsider this c 8615 /* Is it readable? Reconsider this code with TCP-style support. */
8688 if (!skb_queue_empty_lockless(&sk->sk 8616 if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
8689 mask |= EPOLLIN | EPOLLRDNORM 8617 mask |= EPOLLIN | EPOLLRDNORM;
8690 8618
8691 /* The association is either gone or 8619 /* The association is either gone or not ready. */
8692 if (!sctp_style(sk, UDP) && sctp_ssta 8620 if (!sctp_style(sk, UDP) && sctp_sstate(sk, CLOSED))
8693 return mask; 8621 return mask;
8694 8622
8695 /* Is it writable? */ 8623 /* Is it writable? */
8696 if (sctp_writeable(sk)) { 8624 if (sctp_writeable(sk)) {
8697 mask |= EPOLLOUT | EPOLLWRNOR 8625 mask |= EPOLLOUT | EPOLLWRNORM;
8698 } else { 8626 } else {
8699 sk_set_bit(SOCKWQ_ASYNC_NOSPA 8627 sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
8700 /* 8628 /*
8701 * Since the socket is not lo 8629 * Since the socket is not locked, the buffer
8702 * might be made available af 8630 * might be made available after the writeable check and
8703 * before the bit is set. Th 8631 * before the bit is set. This could cause a lost I/O
8704 * signal. tcp_poll() has a 8632 * signal. tcp_poll() has a race breaker for this race
8705 * condition. Based on their 8633 * condition. Based on their implementation, we put
8706 * in the following code to c 8634 * in the following code to cover it as well.
8707 */ 8635 */
8708 if (sctp_writeable(sk)) 8636 if (sctp_writeable(sk))
8709 mask |= EPOLLOUT | EP 8637 mask |= EPOLLOUT | EPOLLWRNORM;
8710 } 8638 }
8711 return mask; 8639 return mask;
8712 } 8640 }
8713 8641
8714 /******************************************** 8642 /********************************************************************
8715 * 2nd Level Abstractions 8643 * 2nd Level Abstractions
8716 ******************************************** 8644 ********************************************************************/
8717 8645
8718 static struct sctp_bind_bucket *sctp_bucket_c 8646 static struct sctp_bind_bucket *sctp_bucket_create(
8719 struct sctp_bind_hashbucket *head, st 8647 struct sctp_bind_hashbucket *head, struct net *net, unsigned short snum)
8720 { 8648 {
8721 struct sctp_bind_bucket *pp; 8649 struct sctp_bind_bucket *pp;
8722 8650
8723 pp = kmem_cache_alloc(sctp_bucket_cac 8651 pp = kmem_cache_alloc(sctp_bucket_cachep, GFP_ATOMIC);
8724 if (pp) { 8652 if (pp) {
8725 SCTP_DBG_OBJCNT_INC(bind_buck 8653 SCTP_DBG_OBJCNT_INC(bind_bucket);
8726 pp->port = snum; 8654 pp->port = snum;
8727 pp->fastreuse = 0; 8655 pp->fastreuse = 0;
8728 INIT_HLIST_HEAD(&pp->owner); 8656 INIT_HLIST_HEAD(&pp->owner);
8729 pp->net = net; 8657 pp->net = net;
8730 hlist_add_head(&pp->node, &he 8658 hlist_add_head(&pp->node, &head->chain);
8731 } 8659 }
8732 return pp; 8660 return pp;
8733 } 8661 }
8734 8662
8735 /* Caller must hold hashbucket lock for this 8663 /* Caller must hold hashbucket lock for this tb with local BH disabled */
8736 static void sctp_bucket_destroy(struct sctp_b 8664 static void sctp_bucket_destroy(struct sctp_bind_bucket *pp)
8737 { 8665 {
8738 if (pp && hlist_empty(&pp->owner)) { 8666 if (pp && hlist_empty(&pp->owner)) {
8739 __hlist_del(&pp->node); 8667 __hlist_del(&pp->node);
8740 kmem_cache_free(sctp_bucket_c 8668 kmem_cache_free(sctp_bucket_cachep, pp);
8741 SCTP_DBG_OBJCNT_DEC(bind_buck 8669 SCTP_DBG_OBJCNT_DEC(bind_bucket);
8742 } 8670 }
8743 } 8671 }
8744 8672
8745 /* Release this socket's reference to a local 8673 /* Release this socket's reference to a local port. */
8746 static inline void __sctp_put_port(struct soc 8674 static inline void __sctp_put_port(struct sock *sk)
8747 { 8675 {
8748 struct sctp_bind_hashbucket *head = 8676 struct sctp_bind_hashbucket *head =
8749 &sctp_port_hashtable[sctp_pha 8677 &sctp_port_hashtable[sctp_phashfn(sock_net(sk),
8750 8678 inet_sk(sk)->inet_num)];
8751 struct sctp_bind_bucket *pp; 8679 struct sctp_bind_bucket *pp;
8752 8680
8753 spin_lock(&head->lock); 8681 spin_lock(&head->lock);
8754 pp = sctp_sk(sk)->bind_hash; 8682 pp = sctp_sk(sk)->bind_hash;
8755 __sk_del_bind_node(sk); 8683 __sk_del_bind_node(sk);
8756 sctp_sk(sk)->bind_hash = NULL; 8684 sctp_sk(sk)->bind_hash = NULL;
8757 inet_sk(sk)->inet_num = 0; 8685 inet_sk(sk)->inet_num = 0;
8758 sctp_bucket_destroy(pp); 8686 sctp_bucket_destroy(pp);
8759 spin_unlock(&head->lock); 8687 spin_unlock(&head->lock);
8760 } 8688 }
8761 8689
8762 void sctp_put_port(struct sock *sk) 8690 void sctp_put_port(struct sock *sk)
8763 { 8691 {
8764 local_bh_disable(); 8692 local_bh_disable();
8765 __sctp_put_port(sk); 8693 __sctp_put_port(sk);
8766 local_bh_enable(); 8694 local_bh_enable();
8767 } 8695 }
8768 8696
8769 /* 8697 /*
8770 * The system picks an ephemeral port and cho 8698 * The system picks an ephemeral port and choose an address set equivalent
8771 * to binding with a wildcard address. 8699 * to binding with a wildcard address.
8772 * One of those addresses will be the primary 8700 * One of those addresses will be the primary address for the association.
8773 * This automatically enables the multihoming 8701 * This automatically enables the multihoming capability of SCTP.
8774 */ 8702 */
8775 static int sctp_autobind(struct sock *sk) 8703 static int sctp_autobind(struct sock *sk)
8776 { 8704 {
8777 union sctp_addr autoaddr; 8705 union sctp_addr autoaddr;
8778 struct sctp_af *af; 8706 struct sctp_af *af;
8779 __be16 port; 8707 __be16 port;
8780 8708
8781 /* Initialize a local sockaddr struct 8709 /* Initialize a local sockaddr structure to INADDR_ANY. */
8782 af = sctp_sk(sk)->pf->af; 8710 af = sctp_sk(sk)->pf->af;
8783 8711
8784 port = htons(inet_sk(sk)->inet_num); 8712 port = htons(inet_sk(sk)->inet_num);
8785 af->inaddr_any(&autoaddr, port); 8713 af->inaddr_any(&autoaddr, port);
8786 8714
8787 return sctp_do_bind(sk, &autoaddr, af 8715 return sctp_do_bind(sk, &autoaddr, af->sockaddr_len);
8788 } 8716 }
8789 8717
8790 /* Parse out IPPROTO_SCTP CMSG headers. Perf 8718 /* Parse out IPPROTO_SCTP CMSG headers. Perform only minimal validation.
8791 * 8719 *
8792 * From RFC 2292 8720 * From RFC 2292
8793 * 4.2 The cmsghdr Structure * 8721 * 4.2 The cmsghdr Structure *
8794 * 8722 *
8795 * When ancillary data is sent or received, a 8723 * When ancillary data is sent or received, any number of ancillary data
8796 * objects can be specified by the msg_contro 8724 * objects can be specified by the msg_control and msg_controllen members of
8797 * the msghdr structure, because each object 8725 * the msghdr structure, because each object is preceded by
8798 * a cmsghdr structure defining the object's 8726 * a cmsghdr structure defining the object's length (the cmsg_len member).
8799 * Historically Berkeley-derived implementati 8727 * Historically Berkeley-derived implementations have passed only one object
8800 * at a time, but this API allows multiple ob 8728 * at a time, but this API allows multiple objects to be
8801 * passed in a single call to sendmsg() or re 8729 * passed in a single call to sendmsg() or recvmsg(). The following example
8802 * shows two ancillary data objects in a cont 8730 * shows two ancillary data objects in a control buffer.
8803 * 8731 *
8804 * |<--------------------------- msg_contro 8732 * |<--------------------------- msg_controllen -------------------------->|
8805 * | 8733 * | |
8806 * 8734 *
8807 * |<----- ancillary data object ----->|<-- 8735 * |<----- ancillary data object ----->|<----- ancillary data object ----->|
8808 * 8736 *
8809 * |<---------- CMSG_SPACE() --------->|<-- 8737 * |<---------- CMSG_SPACE() --------->|<---------- CMSG_SPACE() --------->|
8810 * | | 8738 * | | |
8811 * 8739 *
8812 * |<---------- cmsg_len ---------->| |<-- 8740 * |<---------- cmsg_len ---------->| |<--------- cmsg_len ----------->| |
8813 * 8741 *
8814 * |<--------- CMSG_LEN() --------->| |<-- 8742 * |<--------- CMSG_LEN() --------->| |<-------- CMSG_LEN() ---------->| |
8815 * | | | 8743 * | | | | |
8816 * 8744 *
8817 * +-----+-----+-----+--+-----------+--+--- 8745 * +-----+-----+-----+--+-----------+--+-----+-----+-----+--+-----------+--+
8818 * |cmsg_|cmsg_|cmsg_|XX| |XX|cms 8746 * |cmsg_|cmsg_|cmsg_|XX| |XX|cmsg_|cmsg_|cmsg_|XX| |XX|
8819 * 8747 *
8820 * |len |level|type |XX|cmsg_data[]|XX|len 8748 * |len |level|type |XX|cmsg_data[]|XX|len |level|type |XX|cmsg_data[]|XX|
8821 * 8749 *
8822 * +-----+-----+-----+--+-----------+--+--- 8750 * +-----+-----+-----+--+-----------+--+-----+-----+-----+--+-----------+--+
8823 * ^ 8751 * ^
8824 * | 8752 * |
8825 * 8753 *
8826 * msg_control 8754 * msg_control
8827 * points here 8755 * points here
8828 */ 8756 */
8829 static int sctp_msghdr_parse(const struct msg 8757 static int sctp_msghdr_parse(const struct msghdr *msg, struct sctp_cmsgs *cmsgs)
8830 { 8758 {
8831 struct msghdr *my_msg = (struct msghd 8759 struct msghdr *my_msg = (struct msghdr *)msg;
8832 struct cmsghdr *cmsg; 8760 struct cmsghdr *cmsg;
8833 8761
8834 for_each_cmsghdr(cmsg, my_msg) { 8762 for_each_cmsghdr(cmsg, my_msg) {
8835 if (!CMSG_OK(my_msg, cmsg)) 8763 if (!CMSG_OK(my_msg, cmsg))
8836 return -EINVAL; 8764 return -EINVAL;
8837 8765
8838 /* Should we parse this heade 8766 /* Should we parse this header or ignore? */
8839 if (cmsg->cmsg_level != IPPRO 8767 if (cmsg->cmsg_level != IPPROTO_SCTP)
8840 continue; 8768 continue;
8841 8769
8842 /* Strictly check lengths fol 8770 /* Strictly check lengths following example in SCM code. */
8843 switch (cmsg->cmsg_type) { 8771 switch (cmsg->cmsg_type) {
8844 case SCTP_INIT: 8772 case SCTP_INIT:
8845 /* SCTP Socket API Ex 8773 /* SCTP Socket API Extension
8846 * 5.3.1 SCTP Initiat 8774 * 5.3.1 SCTP Initiation Structure (SCTP_INIT)
8847 * 8775 *
8848 * This cmsghdr struc 8776 * This cmsghdr structure provides information for
8849 * initializing new S 8777 * initializing new SCTP associations with sendmsg().
8850 * The SCTP_INITMSG s 8778 * The SCTP_INITMSG socket option uses this same data
8851 * structure. This s 8779 * structure. This structure is not used for
8852 * recvmsg(). 8780 * recvmsg().
8853 * 8781 *
8854 * cmsg_level cmsg 8782 * cmsg_level cmsg_type cmsg_data[]
8855 * ------------ ---- 8783 * ------------ ------------ ----------------------
8856 * IPPROTO_SCTP SCTP 8784 * IPPROTO_SCTP SCTP_INIT struct sctp_initmsg
8857 */ 8785 */
8858 if (cmsg->cmsg_len != 8786 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_initmsg)))
8859 return -EINVA 8787 return -EINVAL;
8860 8788
8861 cmsgs->init = CMSG_DA 8789 cmsgs->init = CMSG_DATA(cmsg);
8862 break; 8790 break;
8863 8791
8864 case SCTP_SNDRCV: 8792 case SCTP_SNDRCV:
8865 /* SCTP Socket API Ex 8793 /* SCTP Socket API Extension
8866 * 5.3.2 SCTP Header 8794 * 5.3.2 SCTP Header Information Structure(SCTP_SNDRCV)
8867 * 8795 *
8868 * This cmsghdr struc 8796 * This cmsghdr structure specifies SCTP options for
8869 * sendmsg() and desc 8797 * sendmsg() and describes SCTP header information
8870 * about a received m 8798 * about a received message through recvmsg().
8871 * 8799 *
8872 * cmsg_level cmsg 8800 * cmsg_level cmsg_type cmsg_data[]
8873 * ------------ ---- 8801 * ------------ ------------ ----------------------
8874 * IPPROTO_SCTP SCTP 8802 * IPPROTO_SCTP SCTP_SNDRCV struct sctp_sndrcvinfo
8875 */ 8803 */
8876 if (cmsg->cmsg_len != 8804 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_sndrcvinfo)))
8877 return -EINVA 8805 return -EINVAL;
8878 8806
8879 cmsgs->srinfo = CMSG_ 8807 cmsgs->srinfo = CMSG_DATA(cmsg);
8880 8808
8881 if (cmsgs->srinfo->si 8809 if (cmsgs->srinfo->sinfo_flags &
8882 ~(SCTP_UNORDERED 8810 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
8883 SCTP_SACK_IMMED 8811 SCTP_SACK_IMMEDIATELY | SCTP_SENDALL |
8884 SCTP_PR_SCTP_MA 8812 SCTP_PR_SCTP_MASK | SCTP_ABORT | SCTP_EOF))
8885 return -EINVA 8813 return -EINVAL;
8886 break; 8814 break;
8887 8815
8888 case SCTP_SNDINFO: 8816 case SCTP_SNDINFO:
8889 /* SCTP Socket API Ex 8817 /* SCTP Socket API Extension
8890 * 5.3.4 SCTP Send In 8818 * 5.3.4 SCTP Send Information Structure (SCTP_SNDINFO)
8891 * 8819 *
8892 * This cmsghdr struc 8820 * This cmsghdr structure specifies SCTP options for
8893 * sendmsg(). This st 8821 * sendmsg(). This structure and SCTP_RCVINFO replaces
8894 * SCTP_SNDRCV which 8822 * SCTP_SNDRCV which has been deprecated.
8895 * 8823 *
8896 * cmsg_level cmsg 8824 * cmsg_level cmsg_type cmsg_data[]
8897 * ------------ ---- 8825 * ------------ ------------ ---------------------
8898 * IPPROTO_SCTP SCTP 8826 * IPPROTO_SCTP SCTP_SNDINFO struct sctp_sndinfo
8899 */ 8827 */
8900 if (cmsg->cmsg_len != 8828 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_sndinfo)))
8901 return -EINVA 8829 return -EINVAL;
8902 8830
8903 cmsgs->sinfo = CMSG_D 8831 cmsgs->sinfo = CMSG_DATA(cmsg);
8904 8832
8905 if (cmsgs->sinfo->snd 8833 if (cmsgs->sinfo->snd_flags &
8906 ~(SCTP_UNORDERED 8834 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
8907 SCTP_SACK_IMMED 8835 SCTP_SACK_IMMEDIATELY | SCTP_SENDALL |
8908 SCTP_PR_SCTP_MA 8836 SCTP_PR_SCTP_MASK | SCTP_ABORT | SCTP_EOF))
8909 return -EINVA 8837 return -EINVAL;
8910 break; 8838 break;
8911 case SCTP_PRINFO: 8839 case SCTP_PRINFO:
8912 /* SCTP Socket API Ex 8840 /* SCTP Socket API Extension
8913 * 5.3.7 SCTP PR-SCTP 8841 * 5.3.7 SCTP PR-SCTP Information Structure (SCTP_PRINFO)
8914 * 8842 *
8915 * This cmsghdr struc 8843 * This cmsghdr structure specifies SCTP options for sendmsg().
8916 * 8844 *
8917 * cmsg_level cmsg 8845 * cmsg_level cmsg_type cmsg_data[]
8918 * ------------ ---- 8846 * ------------ ------------ ---------------------
8919 * IPPROTO_SCTP SCTP 8847 * IPPROTO_SCTP SCTP_PRINFO struct sctp_prinfo
8920 */ 8848 */
8921 if (cmsg->cmsg_len != 8849 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_prinfo)))
8922 return -EINVA 8850 return -EINVAL;
8923 8851
8924 cmsgs->prinfo = CMSG_ 8852 cmsgs->prinfo = CMSG_DATA(cmsg);
8925 if (cmsgs->prinfo->pr 8853 if (cmsgs->prinfo->pr_policy & ~SCTP_PR_SCTP_MASK)
8926 return -EINVA 8854 return -EINVAL;
8927 8855
8928 if (cmsgs->prinfo->pr 8856 if (cmsgs->prinfo->pr_policy == SCTP_PR_SCTP_NONE)
8929 cmsgs->prinfo 8857 cmsgs->prinfo->pr_value = 0;
8930 break; 8858 break;
8931 case SCTP_AUTHINFO: 8859 case SCTP_AUTHINFO:
8932 /* SCTP Socket API Ex 8860 /* SCTP Socket API Extension
8933 * 5.3.8 SCTP AUTH In 8861 * 5.3.8 SCTP AUTH Information Structure (SCTP_AUTHINFO)
8934 * 8862 *
8935 * This cmsghdr struc 8863 * This cmsghdr structure specifies SCTP options for sendmsg().
8936 * 8864 *
8937 * cmsg_level cmsg 8865 * cmsg_level cmsg_type cmsg_data[]
8938 * ------------ ---- 8866 * ------------ ------------ ---------------------
8939 * IPPROTO_SCTP SCTP 8867 * IPPROTO_SCTP SCTP_AUTHINFO struct sctp_authinfo
8940 */ 8868 */
8941 if (cmsg->cmsg_len != 8869 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_authinfo)))
8942 return -EINVA 8870 return -EINVAL;
8943 8871
8944 cmsgs->authinfo = CMS 8872 cmsgs->authinfo = CMSG_DATA(cmsg);
8945 break; 8873 break;
8946 case SCTP_DSTADDRV4: 8874 case SCTP_DSTADDRV4:
8947 case SCTP_DSTADDRV6: 8875 case SCTP_DSTADDRV6:
8948 /* SCTP Socket API Ex 8876 /* SCTP Socket API Extension
8949 * 5.3.9/10 SCTP Dest 8877 * 5.3.9/10 SCTP Destination IPv4/6 Address Structure (SCTP_DSTADDRV4/6)
8950 * 8878 *
8951 * This cmsghdr struc 8879 * This cmsghdr structure specifies SCTP options for sendmsg().
8952 * 8880 *
8953 * cmsg_level cmsg 8881 * cmsg_level cmsg_type cmsg_data[]
8954 * ------------ ---- 8882 * ------------ ------------ ---------------------
8955 * IPPROTO_SCTP SCTP 8883 * IPPROTO_SCTP SCTP_DSTADDRV4 struct in_addr
8956 * ------------ ---- 8884 * ------------ ------------ ---------------------
8957 * IPPROTO_SCTP SCTP 8885 * IPPROTO_SCTP SCTP_DSTADDRV6 struct in6_addr
8958 */ 8886 */
8959 cmsgs->addrs_msg = my 8887 cmsgs->addrs_msg = my_msg;
8960 break; 8888 break;
8961 default: 8889 default:
8962 return -EINVAL; 8890 return -EINVAL;
8963 } 8891 }
8964 } 8892 }
8965 8893
8966 return 0; 8894 return 0;
8967 } 8895 }
8968 8896
8969 /* 8897 /*
8970 * Wait for a packet.. 8898 * Wait for a packet..
8971 * Note: This function is the same function a 8899 * Note: This function is the same function as in core/datagram.c
8972 * with a few modifications to make lksctp wo 8900 * with a few modifications to make lksctp work.
8973 */ 8901 */
8974 static int sctp_wait_for_packet(struct sock * 8902 static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p)
8975 { 8903 {
8976 int error; 8904 int error;
8977 DEFINE_WAIT(wait); 8905 DEFINE_WAIT(wait);
8978 8906
8979 prepare_to_wait_exclusive(sk_sleep(sk 8907 prepare_to_wait_exclusive(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
8980 8908
8981 /* Socket errors? */ 8909 /* Socket errors? */
8982 error = sock_error(sk); 8910 error = sock_error(sk);
8983 if (error) 8911 if (error)
8984 goto out; 8912 goto out;
8985 8913
8986 if (!skb_queue_empty(&sk->sk_receive_ 8914 if (!skb_queue_empty(&sk->sk_receive_queue))
8987 goto ready; 8915 goto ready;
8988 8916
8989 /* Socket shut down? */ 8917 /* Socket shut down? */
8990 if (sk->sk_shutdown & RCV_SHUTDOWN) 8918 if (sk->sk_shutdown & RCV_SHUTDOWN)
8991 goto out; 8919 goto out;
8992 8920
8993 /* Sequenced packets can come disconn 8921 /* Sequenced packets can come disconnected. If so we report the
8994 * problem. 8922 * problem.
8995 */ 8923 */
8996 error = -ENOTCONN; 8924 error = -ENOTCONN;
8997 8925
8998 /* Is there a good reason to think th 8926 /* Is there a good reason to think that we may receive some data? */
8999 if (list_empty(&sctp_sk(sk)->ep->asoc 8927 if (list_empty(&sctp_sk(sk)->ep->asocs) && !sctp_sstate(sk, LISTENING))
9000 goto out; 8928 goto out;
9001 8929
9002 /* Handle signals. */ 8930 /* Handle signals. */
9003 if (signal_pending(current)) 8931 if (signal_pending(current))
9004 goto interrupted; 8932 goto interrupted;
9005 8933
9006 /* Let another process have a go. Si 8934 /* Let another process have a go. Since we are going to sleep
9007 * anyway. Note: This may cause odd 8935 * anyway. Note: This may cause odd behaviors if the message
9008 * does not fit in the user's buffer, 8936 * does not fit in the user's buffer, but this seems to be the
9009 * only way to honor MSG_DONTWAIT rea 8937 * only way to honor MSG_DONTWAIT realistically.
9010 */ 8938 */
9011 release_sock(sk); 8939 release_sock(sk);
9012 *timeo_p = schedule_timeout(*timeo_p) 8940 *timeo_p = schedule_timeout(*timeo_p);
9013 lock_sock(sk); 8941 lock_sock(sk);
9014 8942
9015 ready: 8943 ready:
9016 finish_wait(sk_sleep(sk), &wait); 8944 finish_wait(sk_sleep(sk), &wait);
9017 return 0; 8945 return 0;
9018 8946
9019 interrupted: 8947 interrupted:
9020 error = sock_intr_errno(*timeo_p); 8948 error = sock_intr_errno(*timeo_p);
9021 8949
9022 out: 8950 out:
9023 finish_wait(sk_sleep(sk), &wait); 8951 finish_wait(sk_sleep(sk), &wait);
9024 *err = error; 8952 *err = error;
9025 return error; 8953 return error;
9026 } 8954 }
9027 8955
9028 /* Receive a datagram. 8956 /* Receive a datagram.
9029 * Note: This is pretty much the same routine 8957 * Note: This is pretty much the same routine as in core/datagram.c
9030 * with a few changes to make lksctp work. 8958 * with a few changes to make lksctp work.
9031 */ 8959 */
9032 struct sk_buff *sctp_skb_recv_datagram(struct !! 8960 struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
>> 8961 int noblock, int *err)
9033 { 8962 {
9034 int error; 8963 int error;
9035 struct sk_buff *skb; 8964 struct sk_buff *skb;
9036 long timeo; 8965 long timeo;
9037 8966
9038 timeo = sock_rcvtimeo(sk, flags & MSG !! 8967 timeo = sock_rcvtimeo(sk, noblock);
9039 8968
9040 pr_debug("%s: timeo:%ld, max:%ld\n", 8969 pr_debug("%s: timeo:%ld, max:%ld\n", __func__, timeo,
9041 MAX_SCHEDULE_TIMEOUT); 8970 MAX_SCHEDULE_TIMEOUT);
9042 8971
9043 do { 8972 do {
9044 /* Again only user level code 8973 /* Again only user level code calls this function,
9045 * so nothing interrupt level 8974 * so nothing interrupt level
9046 * will suddenly eat the rece 8975 * will suddenly eat the receive_queue.
9047 * 8976 *
9048 * Look at current nfs clien 8977 * Look at current nfs client by the way...
9049 * However, this function wa 8978 * However, this function was correct in any case. 8)
9050 */ 8979 */
9051 if (flags & MSG_PEEK) { 8980 if (flags & MSG_PEEK) {
9052 skb = skb_peek(&sk->s 8981 skb = skb_peek(&sk->sk_receive_queue);
9053 if (skb) 8982 if (skb)
9054 refcount_inc( 8983 refcount_inc(&skb->users);
9055 } else { 8984 } else {
9056 skb = __skb_dequeue(& 8985 skb = __skb_dequeue(&sk->sk_receive_queue);
9057 } 8986 }
9058 8987
9059 if (skb) 8988 if (skb)
9060 return skb; 8989 return skb;
9061 8990
9062 /* Caller is allowed not to c 8991 /* Caller is allowed not to check sk->sk_err before calling. */
9063 error = sock_error(sk); 8992 error = sock_error(sk);
9064 if (error) 8993 if (error)
9065 goto no_packet; 8994 goto no_packet;
9066 8995
9067 if (sk->sk_shutdown & RCV_SHU 8996 if (sk->sk_shutdown & RCV_SHUTDOWN)
9068 break; 8997 break;
9069 8998
>> 8999 if (sk_can_busy_loop(sk)) {
>> 9000 sk_busy_loop(sk, noblock);
>> 9001
>> 9002 if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
>> 9003 continue;
>> 9004 }
9070 9005
9071 /* User doesn't want to wait. 9006 /* User doesn't want to wait. */
9072 error = -EAGAIN; 9007 error = -EAGAIN;
9073 if (!timeo) 9008 if (!timeo)
9074 goto no_packet; 9009 goto no_packet;
9075 } while (sctp_wait_for_packet(sk, err 9010 } while (sctp_wait_for_packet(sk, err, &timeo) == 0);
9076 9011
9077 return NULL; 9012 return NULL;
9078 9013
9079 no_packet: 9014 no_packet:
9080 *err = error; 9015 *err = error;
9081 return NULL; 9016 return NULL;
9082 } 9017 }
9083 9018
9084 /* If sndbuf has changed, wake up per associa 9019 /* If sndbuf has changed, wake up per association sndbuf waiters. */
9085 static void __sctp_write_space(struct sctp_as 9020 static void __sctp_write_space(struct sctp_association *asoc)
9086 { 9021 {
9087 struct sock *sk = asoc->base.sk; 9022 struct sock *sk = asoc->base.sk;
9088 9023
9089 if (sctp_wspace(asoc) <= 0) 9024 if (sctp_wspace(asoc) <= 0)
9090 return; 9025 return;
9091 9026
9092 if (waitqueue_active(&asoc->wait)) 9027 if (waitqueue_active(&asoc->wait))
9093 wake_up_interruptible(&asoc-> 9028 wake_up_interruptible(&asoc->wait);
9094 9029
9095 if (sctp_writeable(sk)) { 9030 if (sctp_writeable(sk)) {
9096 struct socket_wq *wq; 9031 struct socket_wq *wq;
9097 9032
9098 rcu_read_lock(); 9033 rcu_read_lock();
9099 wq = rcu_dereference(sk->sk_w 9034 wq = rcu_dereference(sk->sk_wq);
9100 if (wq) { 9035 if (wq) {
9101 if (waitqueue_active( 9036 if (waitqueue_active(&wq->wait))
9102 wake_up_inter 9037 wake_up_interruptible(&wq->wait);
9103 9038
9104 /* Note that we try t 9039 /* Note that we try to include the Async I/O support
9105 * here by modeling f 9040 * here by modeling from the current TCP/UDP code.
9106 * We have not tested 9041 * We have not tested with it yet.
9107 */ 9042 */
9108 if (!(sk->sk_shutdown 9043 if (!(sk->sk_shutdown & SEND_SHUTDOWN))
9109 sock_wake_asy 9044 sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT);
9110 } 9045 }
9111 rcu_read_unlock(); 9046 rcu_read_unlock();
9112 } 9047 }
9113 } 9048 }
9114 9049
9115 static void sctp_wake_up_waiters(struct sock 9050 static void sctp_wake_up_waiters(struct sock *sk,
9116 struct sctp_ 9051 struct sctp_association *asoc)
9117 { 9052 {
9118 struct sctp_association *tmp = asoc; 9053 struct sctp_association *tmp = asoc;
9119 9054
9120 /* We do accounting for the sndbuf sp 9055 /* We do accounting for the sndbuf space per association,
9121 * so we only need to wake our own as 9056 * so we only need to wake our own association.
9122 */ 9057 */
9123 if (asoc->ep->sndbuf_policy) 9058 if (asoc->ep->sndbuf_policy)
9124 return __sctp_write_space(aso 9059 return __sctp_write_space(asoc);
9125 9060
9126 /* If association goes down and is ju 9061 /* If association goes down and is just flushing its
9127 * outq, then just normally notify ot 9062 * outq, then just normally notify others.
9128 */ 9063 */
9129 if (asoc->base.dead) 9064 if (asoc->base.dead)
9130 return sctp_write_space(sk); 9065 return sctp_write_space(sk);
9131 9066
9132 /* Accounting for the sndbuf space is 9067 /* Accounting for the sndbuf space is per socket, so we
9133 * need to wake up others, try to be 9068 * need to wake up others, try to be fair and in case of
9134 * other associations, let them have 9069 * other associations, let them have a go first instead
9135 * of just doing a sctp_write_space() 9070 * of just doing a sctp_write_space() call.
9136 * 9071 *
9137 * Note that we reach sctp_wake_up_wa 9072 * Note that we reach sctp_wake_up_waiters() only when
9138 * associations free up queued chunks 9073 * associations free up queued chunks, thus we are under
9139 * lock and the list of associations 9074 * lock and the list of associations on a socket is
9140 * guaranteed not to change. 9075 * guaranteed not to change.
9141 */ 9076 */
9142 for (tmp = list_next_entry(tmp, asocs 9077 for (tmp = list_next_entry(tmp, asocs); 1;
9143 tmp = list_next_entry(tmp, asocs 9078 tmp = list_next_entry(tmp, asocs)) {
9144 /* Manually skip the head ele 9079 /* Manually skip the head element. */
9145 if (&tmp->asocs == &((sctp_sk 9080 if (&tmp->asocs == &((sctp_sk(sk))->ep->asocs))
9146 continue; 9081 continue;
9147 /* Wake up association. */ 9082 /* Wake up association. */
9148 __sctp_write_space(tmp); 9083 __sctp_write_space(tmp);
9149 /* We've reached the end. */ 9084 /* We've reached the end. */
9150 if (tmp == asoc) 9085 if (tmp == asoc)
9151 break; 9086 break;
9152 } 9087 }
9153 } 9088 }
9154 9089
9155 /* Do accounting for the sndbuf space. 9090 /* Do accounting for the sndbuf space.
9156 * Decrement the used sndbuf space of the cor 9091 * Decrement the used sndbuf space of the corresponding association by the
9157 * data size which was just transmitted(freed 9092 * data size which was just transmitted(freed).
9158 */ 9093 */
9159 static void sctp_wfree(struct sk_buff *skb) 9094 static void sctp_wfree(struct sk_buff *skb)
9160 { 9095 {
9161 struct sctp_chunk *chunk = skb_shinfo 9096 struct sctp_chunk *chunk = skb_shinfo(skb)->destructor_arg;
9162 struct sctp_association *asoc = chunk 9097 struct sctp_association *asoc = chunk->asoc;
9163 struct sock *sk = asoc->base.sk; 9098 struct sock *sk = asoc->base.sk;
9164 9099
9165 sk_mem_uncharge(sk, skb->truesize); 9100 sk_mem_uncharge(sk, skb->truesize);
9166 sk_wmem_queued_add(sk, -(skb->truesiz !! 9101 sk->sk_wmem_queued -= skb->truesize + sizeof(struct sctp_chunk);
9167 asoc->sndbuf_used -= skb->truesize + 9102 asoc->sndbuf_used -= skb->truesize + sizeof(struct sctp_chunk);
9168 WARN_ON(refcount_sub_and_test(sizeof( 9103 WARN_ON(refcount_sub_and_test(sizeof(struct sctp_chunk),
9169 &sk->sk 9104 &sk->sk_wmem_alloc));
9170 9105
9171 if (chunk->shkey) { 9106 if (chunk->shkey) {
9172 struct sctp_shared_key *shkey 9107 struct sctp_shared_key *shkey = chunk->shkey;
9173 9108
9174 /* refcnt == 2 and !list_empt 9109 /* refcnt == 2 and !list_empty mean after this release, it's
9175 * not being used anywhere, a 9110 * not being used anywhere, and it's time to notify userland
9176 * that this shkey can be fre 9111 * that this shkey can be freed if it's been deactivated.
9177 */ 9112 */
9178 if (shkey->deactivated && !li 9113 if (shkey->deactivated && !list_empty(&shkey->key_list) &&
9179 refcount_read(&shkey->ref 9114 refcount_read(&shkey->refcnt) == 2) {
9180 struct sctp_ulpevent 9115 struct sctp_ulpevent *ev;
9181 9116
9182 ev = sctp_ulpevent_ma 9117 ev = sctp_ulpevent_make_authkey(asoc, shkey->key_id,
9183 9118 SCTP_AUTH_FREE_KEY,
9184 9119 GFP_KERNEL);
9185 if (ev) 9120 if (ev)
9186 asoc->stream. 9121 asoc->stream.si->enqueue_event(&asoc->ulpq, ev);
9187 } 9122 }
9188 sctp_auth_shkey_release(chunk 9123 sctp_auth_shkey_release(chunk->shkey);
9189 } 9124 }
9190 9125
9191 sock_wfree(skb); 9126 sock_wfree(skb);
9192 sctp_wake_up_waiters(sk, asoc); 9127 sctp_wake_up_waiters(sk, asoc);
9193 9128
9194 sctp_association_put(asoc); 9129 sctp_association_put(asoc);
9195 } 9130 }
9196 9131
9197 /* Do accounting for the receive space on the 9132 /* Do accounting for the receive space on the socket.
9198 * Accounting for the association is done in 9133 * Accounting for the association is done in ulpevent.c
9199 * We set this as a destructor for the cloned 9134 * We set this as a destructor for the cloned data skbs so that
9200 * accounting is done at the correct time. 9135 * accounting is done at the correct time.
9201 */ 9136 */
9202 void sctp_sock_rfree(struct sk_buff *skb) 9137 void sctp_sock_rfree(struct sk_buff *skb)
9203 { 9138 {
9204 struct sock *sk = skb->sk; 9139 struct sock *sk = skb->sk;
9205 struct sctp_ulpevent *event = sctp_sk 9140 struct sctp_ulpevent *event = sctp_skb2event(skb);
9206 9141
9207 atomic_sub(event->rmem_len, &sk->sk_r 9142 atomic_sub(event->rmem_len, &sk->sk_rmem_alloc);
9208 9143
9209 /* 9144 /*
9210 * Mimic the behavior of sock_rfree 9145 * Mimic the behavior of sock_rfree
9211 */ 9146 */
9212 sk_mem_uncharge(sk, event->rmem_len); 9147 sk_mem_uncharge(sk, event->rmem_len);
9213 } 9148 }
9214 9149
9215 9150
9216 /* Helper function to wait for space in the s 9151 /* Helper function to wait for space in the sndbuf. */
9217 static int sctp_wait_for_sndbuf(struct sctp_a 9152 static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
9218 size_t msg_le 9153 size_t msg_len)
9219 { 9154 {
9220 struct sock *sk = asoc->base.sk; 9155 struct sock *sk = asoc->base.sk;
9221 long current_timeo = *timeo_p; 9156 long current_timeo = *timeo_p;
9222 DEFINE_WAIT(wait); 9157 DEFINE_WAIT(wait);
9223 int err = 0; 9158 int err = 0;
9224 9159
9225 pr_debug("%s: asoc:%p, timeo:%ld, msg 9160 pr_debug("%s: asoc:%p, timeo:%ld, msg_len:%zu\n", __func__, asoc,
9226 *timeo_p, msg_len); 9161 *timeo_p, msg_len);
9227 9162
9228 /* Increment the association's refcnt 9163 /* Increment the association's refcnt. */
9229 sctp_association_hold(asoc); 9164 sctp_association_hold(asoc);
9230 9165
9231 /* Wait on the association specific s 9166 /* Wait on the association specific sndbuf space. */
9232 for (;;) { 9167 for (;;) {
9233 prepare_to_wait_exclusive(&as 9168 prepare_to_wait_exclusive(&asoc->wait, &wait,
9234 TAS 9169 TASK_INTERRUPTIBLE);
9235 if (asoc->base.dead) 9170 if (asoc->base.dead)
9236 goto do_dead; 9171 goto do_dead;
9237 if (!*timeo_p) 9172 if (!*timeo_p)
9238 goto do_nonblock; 9173 goto do_nonblock;
9239 if (sk->sk_err || asoc->state 9174 if (sk->sk_err || asoc->state >= SCTP_STATE_SHUTDOWN_PENDING)
9240 goto do_error; 9175 goto do_error;
9241 if (signal_pending(current)) 9176 if (signal_pending(current))
9242 goto do_interrupted; 9177 goto do_interrupted;
>> 9178 if (sk_under_memory_pressure(sk))
>> 9179 sk_mem_reclaim(sk);
9243 if ((int)msg_len <= sctp_wspa 9180 if ((int)msg_len <= sctp_wspace(asoc) &&
9244 sk_wmem_schedule(sk, msg_ 9181 sk_wmem_schedule(sk, msg_len))
9245 break; 9182 break;
9246 9183
9247 /* Let another process have a 9184 /* Let another process have a go. Since we are going
9248 * to sleep anyway. 9185 * to sleep anyway.
9249 */ 9186 */
9250 release_sock(sk); 9187 release_sock(sk);
9251 current_timeo = schedule_time 9188 current_timeo = schedule_timeout(current_timeo);
9252 lock_sock(sk); 9189 lock_sock(sk);
9253 if (sk != asoc->base.sk) 9190 if (sk != asoc->base.sk)
9254 goto do_error; 9191 goto do_error;
9255 9192
9256 *timeo_p = current_timeo; 9193 *timeo_p = current_timeo;
9257 } 9194 }
9258 9195
9259 out: 9196 out:
9260 finish_wait(&asoc->wait, &wait); 9197 finish_wait(&asoc->wait, &wait);
9261 9198
9262 /* Release the association's refcnt. 9199 /* Release the association's refcnt. */
9263 sctp_association_put(asoc); 9200 sctp_association_put(asoc);
9264 9201
9265 return err; 9202 return err;
9266 9203
9267 do_dead: 9204 do_dead:
9268 err = -ESRCH; 9205 err = -ESRCH;
9269 goto out; 9206 goto out;
9270 9207
9271 do_error: 9208 do_error:
9272 err = -EPIPE; 9209 err = -EPIPE;
9273 goto out; 9210 goto out;
9274 9211
9275 do_interrupted: 9212 do_interrupted:
9276 err = sock_intr_errno(*timeo_p); 9213 err = sock_intr_errno(*timeo_p);
9277 goto out; 9214 goto out;
9278 9215
9279 do_nonblock: 9216 do_nonblock:
9280 err = -EAGAIN; 9217 err = -EAGAIN;
9281 goto out; 9218 goto out;
9282 } 9219 }
9283 9220
9284 void sctp_data_ready(struct sock *sk) 9221 void sctp_data_ready(struct sock *sk)
9285 { 9222 {
9286 struct socket_wq *wq; 9223 struct socket_wq *wq;
9287 9224
9288 trace_sk_data_ready(sk); <<
9289 <<
9290 rcu_read_lock(); 9225 rcu_read_lock();
9291 wq = rcu_dereference(sk->sk_wq); 9226 wq = rcu_dereference(sk->sk_wq);
9292 if (skwq_has_sleeper(wq)) 9227 if (skwq_has_sleeper(wq))
9293 wake_up_interruptible_sync_po 9228 wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN |
9294 9229 EPOLLRDNORM | EPOLLRDBAND);
9295 sk_wake_async_rcu(sk, SOCK_WAKE_WAITD !! 9230 sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
9296 rcu_read_unlock(); 9231 rcu_read_unlock();
9297 } 9232 }
9298 9233
9299 /* If socket sndbuf has changed, wake up all 9234 /* If socket sndbuf has changed, wake up all per association waiters. */
9300 void sctp_write_space(struct sock *sk) 9235 void sctp_write_space(struct sock *sk)
9301 { 9236 {
9302 struct sctp_association *asoc; 9237 struct sctp_association *asoc;
9303 9238
9304 /* Wake up the tasks in each wait que 9239 /* Wake up the tasks in each wait queue. */
9305 list_for_each_entry(asoc, &((sctp_sk( 9240 list_for_each_entry(asoc, &((sctp_sk(sk))->ep->asocs), asocs) {
9306 __sctp_write_space(asoc); 9241 __sctp_write_space(asoc);
9307 } 9242 }
9308 } 9243 }
9309 9244
9310 /* Is there any sndbuf space available on the 9245 /* Is there any sndbuf space available on the socket?
9311 * 9246 *
9312 * Note that sk_wmem_alloc is the sum of the 9247 * Note that sk_wmem_alloc is the sum of the send buffers on all of the
9313 * associations on the same socket. For a UD 9248 * associations on the same socket. For a UDP-style socket with
9314 * multiple associations, it is possible for 9249 * multiple associations, it is possible for it to be "unwriteable"
9315 * prematurely. I assume that this is accept 9250 * prematurely. I assume that this is acceptable because
9316 * a premature "unwriteable" is better than a 9251 * a premature "unwriteable" is better than an accidental "writeable" which
9317 * would cause an unwanted block under certai 9252 * would cause an unwanted block under certain circumstances. For the 1-1
9318 * UDP-style sockets or TCP-style sockets, th 9253 * UDP-style sockets or TCP-style sockets, this code should work.
9319 * - Daisy 9254 * - Daisy
9320 */ 9255 */
9321 static bool sctp_writeable(const struct sock !! 9256 static bool sctp_writeable(struct sock *sk)
9322 { 9257 {
9323 return READ_ONCE(sk->sk_sndbuf) > REA !! 9258 return sk->sk_sndbuf > sk->sk_wmem_queued;
9324 } 9259 }
9325 9260
9326 /* Wait for an association to go into ESTABLI 9261 /* Wait for an association to go into ESTABLISHED state. If timeout is 0,
9327 * returns immediately with EINPROGRESS. 9262 * returns immediately with EINPROGRESS.
9328 */ 9263 */
9329 static int sctp_wait_for_connect(struct sctp_ 9264 static int sctp_wait_for_connect(struct sctp_association *asoc, long *timeo_p)
9330 { 9265 {
9331 struct sock *sk = asoc->base.sk; 9266 struct sock *sk = asoc->base.sk;
9332 int err = 0; 9267 int err = 0;
9333 long current_timeo = *timeo_p; 9268 long current_timeo = *timeo_p;
9334 DEFINE_WAIT(wait); 9269 DEFINE_WAIT(wait);
9335 9270
9336 pr_debug("%s: asoc:%p, timeo:%ld\n", 9271 pr_debug("%s: asoc:%p, timeo:%ld\n", __func__, asoc, *timeo_p);
9337 9272
9338 /* Increment the association's refcnt 9273 /* Increment the association's refcnt. */
9339 sctp_association_hold(asoc); 9274 sctp_association_hold(asoc);
9340 9275
9341 for (;;) { 9276 for (;;) {
9342 prepare_to_wait_exclusive(&as 9277 prepare_to_wait_exclusive(&asoc->wait, &wait,
9343 TAS 9278 TASK_INTERRUPTIBLE);
9344 if (!*timeo_p) 9279 if (!*timeo_p)
9345 goto do_nonblock; 9280 goto do_nonblock;
9346 if (sk->sk_shutdown & RCV_SHU 9281 if (sk->sk_shutdown & RCV_SHUTDOWN)
9347 break; 9282 break;
9348 if (sk->sk_err || asoc->state 9283 if (sk->sk_err || asoc->state >= SCTP_STATE_SHUTDOWN_PENDING ||
9349 asoc->base.dead) 9284 asoc->base.dead)
9350 goto do_error; 9285 goto do_error;
9351 if (signal_pending(current)) 9286 if (signal_pending(current))
9352 goto do_interrupted; 9287 goto do_interrupted;
9353 9288
9354 if (sctp_state(asoc, ESTABLIS 9289 if (sctp_state(asoc, ESTABLISHED))
9355 break; 9290 break;
9356 9291
9357 /* Let another process have a 9292 /* Let another process have a go. Since we are going
9358 * to sleep anyway. 9293 * to sleep anyway.
9359 */ 9294 */
9360 release_sock(sk); 9295 release_sock(sk);
9361 current_timeo = schedule_time 9296 current_timeo = schedule_timeout(current_timeo);
9362 lock_sock(sk); 9297 lock_sock(sk);
9363 9298
9364 *timeo_p = current_timeo; 9299 *timeo_p = current_timeo;
9365 } 9300 }
9366 9301
9367 out: 9302 out:
9368 finish_wait(&asoc->wait, &wait); 9303 finish_wait(&asoc->wait, &wait);
9369 9304
9370 /* Release the association's refcnt. 9305 /* Release the association's refcnt. */
9371 sctp_association_put(asoc); 9306 sctp_association_put(asoc);
9372 9307
9373 return err; 9308 return err;
9374 9309
9375 do_error: 9310 do_error:
9376 if (asoc->init_err_counter + 1 > asoc 9311 if (asoc->init_err_counter + 1 > asoc->max_init_attempts)
9377 err = -ETIMEDOUT; 9312 err = -ETIMEDOUT;
9378 else 9313 else
9379 err = -ECONNREFUSED; 9314 err = -ECONNREFUSED;
9380 goto out; 9315 goto out;
9381 9316
9382 do_interrupted: 9317 do_interrupted:
9383 err = sock_intr_errno(*timeo_p); 9318 err = sock_intr_errno(*timeo_p);
9384 goto out; 9319 goto out;
9385 9320
9386 do_nonblock: 9321 do_nonblock:
9387 err = -EINPROGRESS; 9322 err = -EINPROGRESS;
9388 goto out; 9323 goto out;
9389 } 9324 }
9390 9325
9391 static int sctp_wait_for_accept(struct sock * 9326 static int sctp_wait_for_accept(struct sock *sk, long timeo)
9392 { 9327 {
9393 struct sctp_endpoint *ep; 9328 struct sctp_endpoint *ep;
9394 int err = 0; 9329 int err = 0;
9395 DEFINE_WAIT(wait); 9330 DEFINE_WAIT(wait);
9396 9331
9397 ep = sctp_sk(sk)->ep; 9332 ep = sctp_sk(sk)->ep;
9398 9333
9399 9334
9400 for (;;) { 9335 for (;;) {
9401 prepare_to_wait_exclusive(sk_ 9336 prepare_to_wait_exclusive(sk_sleep(sk), &wait,
9402 TAS 9337 TASK_INTERRUPTIBLE);
9403 9338
9404 if (list_empty(&ep->asocs)) { 9339 if (list_empty(&ep->asocs)) {
9405 release_sock(sk); 9340 release_sock(sk);
9406 timeo = schedule_time 9341 timeo = schedule_timeout(timeo);
9407 lock_sock(sk); 9342 lock_sock(sk);
9408 } 9343 }
9409 9344
9410 err = -EINVAL; 9345 err = -EINVAL;
9411 if (!sctp_sstate(sk, LISTENIN !! 9346 if (!sctp_sstate(sk, LISTENING))
9412 (sk->sk_shutdown & RCV_SH <<
9413 break; 9347 break;
9414 9348
9415 err = 0; 9349 err = 0;
9416 if (!list_empty(&ep->asocs)) 9350 if (!list_empty(&ep->asocs))
9417 break; 9351 break;
9418 9352
9419 err = sock_intr_errno(timeo); 9353 err = sock_intr_errno(timeo);
9420 if (signal_pending(current)) 9354 if (signal_pending(current))
9421 break; 9355 break;
9422 9356
9423 err = -EAGAIN; 9357 err = -EAGAIN;
9424 if (!timeo) 9358 if (!timeo)
9425 break; 9359 break;
9426 } 9360 }
9427 9361
9428 finish_wait(sk_sleep(sk), &wait); 9362 finish_wait(sk_sleep(sk), &wait);
9429 9363
9430 return err; 9364 return err;
9431 } 9365 }
9432 9366
9433 static void sctp_wait_for_close(struct sock * 9367 static void sctp_wait_for_close(struct sock *sk, long timeout)
9434 { 9368 {
9435 DEFINE_WAIT(wait); 9369 DEFINE_WAIT(wait);
9436 9370
9437 do { 9371 do {
9438 prepare_to_wait(sk_sleep(sk), 9372 prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
9439 if (list_empty(&sctp_sk(sk)-> 9373 if (list_empty(&sctp_sk(sk)->ep->asocs))
9440 break; 9374 break;
9441 release_sock(sk); 9375 release_sock(sk);
9442 timeout = schedule_timeout(ti 9376 timeout = schedule_timeout(timeout);
9443 lock_sock(sk); 9377 lock_sock(sk);
9444 } while (!signal_pending(current) && 9378 } while (!signal_pending(current) && timeout);
9445 9379
9446 finish_wait(sk_sleep(sk), &wait); 9380 finish_wait(sk_sleep(sk), &wait);
9447 } 9381 }
9448 9382
9449 static void sctp_skb_set_owner_r_frag(struct 9383 static void sctp_skb_set_owner_r_frag(struct sk_buff *skb, struct sock *sk)
9450 { 9384 {
9451 struct sk_buff *frag; 9385 struct sk_buff *frag;
9452 9386
9453 if (!skb->data_len) 9387 if (!skb->data_len)
9454 goto done; 9388 goto done;
9455 9389
9456 /* Don't forget the fragments. */ 9390 /* Don't forget the fragments. */
9457 skb_walk_frags(skb, frag) 9391 skb_walk_frags(skb, frag)
9458 sctp_skb_set_owner_r_frag(fra 9392 sctp_skb_set_owner_r_frag(frag, sk);
9459 9393
9460 done: 9394 done:
9461 sctp_skb_set_owner_r(skb, sk); 9395 sctp_skb_set_owner_r(skb, sk);
9462 } 9396 }
9463 9397
9464 void sctp_copy_sock(struct sock *newsk, struc 9398 void sctp_copy_sock(struct sock *newsk, struct sock *sk,
9465 struct sctp_association * 9399 struct sctp_association *asoc)
9466 { 9400 {
9467 struct inet_sock *inet = inet_sk(sk); 9401 struct inet_sock *inet = inet_sk(sk);
9468 struct inet_sock *newinet; 9402 struct inet_sock *newinet;
9469 struct sctp_sock *sp = sctp_sk(sk); 9403 struct sctp_sock *sp = sctp_sk(sk);
>> 9404 struct sctp_endpoint *ep = sp->ep;
9470 9405
9471 newsk->sk_type = sk->sk_type; 9406 newsk->sk_type = sk->sk_type;
9472 newsk->sk_bound_dev_if = sk->sk_bound 9407 newsk->sk_bound_dev_if = sk->sk_bound_dev_if;
9473 newsk->sk_flags = sk->sk_flags; 9408 newsk->sk_flags = sk->sk_flags;
9474 newsk->sk_tsflags = sk->sk_tsflags; 9409 newsk->sk_tsflags = sk->sk_tsflags;
9475 newsk->sk_no_check_tx = sk->sk_no_che 9410 newsk->sk_no_check_tx = sk->sk_no_check_tx;
9476 newsk->sk_no_check_rx = sk->sk_no_che 9411 newsk->sk_no_check_rx = sk->sk_no_check_rx;
9477 newsk->sk_reuse = sk->sk_reuse; 9412 newsk->sk_reuse = sk->sk_reuse;
9478 sctp_sk(newsk)->reuse = sp->reuse; 9413 sctp_sk(newsk)->reuse = sp->reuse;
9479 9414
9480 newsk->sk_shutdown = sk->sk_shutdown; 9415 newsk->sk_shutdown = sk->sk_shutdown;
9481 newsk->sk_destruct = sk->sk_destruct; !! 9416 newsk->sk_destruct = sctp_destruct_sock;
9482 newsk->sk_family = sk->sk_family; 9417 newsk->sk_family = sk->sk_family;
9483 newsk->sk_protocol = IPPROTO_SCTP; 9418 newsk->sk_protocol = IPPROTO_SCTP;
9484 newsk->sk_backlog_rcv = sk->sk_prot-> 9419 newsk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
9485 newsk->sk_sndbuf = sk->sk_sndbuf; 9420 newsk->sk_sndbuf = sk->sk_sndbuf;
9486 newsk->sk_rcvbuf = sk->sk_rcvbuf; 9421 newsk->sk_rcvbuf = sk->sk_rcvbuf;
9487 newsk->sk_lingertime = sk->sk_lingert 9422 newsk->sk_lingertime = sk->sk_lingertime;
9488 newsk->sk_rcvtimeo = sk->sk_rcvtimeo; 9423 newsk->sk_rcvtimeo = sk->sk_rcvtimeo;
9489 newsk->sk_sndtimeo = sk->sk_sndtimeo; 9424 newsk->sk_sndtimeo = sk->sk_sndtimeo;
9490 newsk->sk_rxhash = sk->sk_rxhash; 9425 newsk->sk_rxhash = sk->sk_rxhash;
9491 9426
9492 newinet = inet_sk(newsk); 9427 newinet = inet_sk(newsk);
9493 9428
9494 /* Initialize sk's sport, dport, rcv_ 9429 /* Initialize sk's sport, dport, rcv_saddr and daddr for
9495 * getsockname() and getpeername() 9430 * getsockname() and getpeername()
9496 */ 9431 */
9497 newinet->inet_sport = inet->inet_spor 9432 newinet->inet_sport = inet->inet_sport;
9498 newinet->inet_saddr = inet->inet_sadd 9433 newinet->inet_saddr = inet->inet_saddr;
9499 newinet->inet_rcv_saddr = inet->inet_ 9434 newinet->inet_rcv_saddr = inet->inet_rcv_saddr;
9500 newinet->inet_dport = htons(asoc->pee 9435 newinet->inet_dport = htons(asoc->peer.port);
9501 newinet->pmtudisc = inet->pmtudisc; 9436 newinet->pmtudisc = inet->pmtudisc;
9502 atomic_set(&newinet->inet_id, get_ran !! 9437 newinet->inet_id = prandom_u32();
9503 9438
9504 newinet->uc_ttl = inet->uc_ttl; 9439 newinet->uc_ttl = inet->uc_ttl;
9505 inet_set_bit(MC_LOOP, newsk); !! 9440 newinet->mc_loop = 1;
9506 newinet->mc_ttl = 1; 9441 newinet->mc_ttl = 1;
9507 newinet->mc_index = 0; 9442 newinet->mc_index = 0;
9508 newinet->mc_list = NULL; 9443 newinet->mc_list = NULL;
9509 9444
9510 if (newsk->sk_flags & SK_FLAGS_TIMEST 9445 if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
9511 net_enable_timestamp(); 9446 net_enable_timestamp();
9512 9447
9513 /* Set newsk security attributes from !! 9448 /* Set newsk security attributes from orginal sk and connection
9514 * security attribute from asoc. !! 9449 * security attribute from ep.
9515 */ 9450 */
9516 security_sctp_sk_clone(asoc, sk, news !! 9451 security_sctp_sk_clone(ep, sk, newsk);
9517 } 9452 }
9518 9453
9519 static inline void sctp_copy_descendant(struc 9454 static inline void sctp_copy_descendant(struct sock *sk_to,
9520 const 9455 const struct sock *sk_from)
9521 { 9456 {
9522 size_t ancestor_size = sizeof(struct !! 9457 int ancestor_size = sizeof(struct inet_sock) +
>> 9458 sizeof(struct sctp_sock) -
>> 9459 offsetof(struct sctp_sock, pd_lobby);
>> 9460
>> 9461 if (sk_from->sk_family == PF_INET6)
>> 9462 ancestor_size += sizeof(struct ipv6_pinfo);
9523 9463
9524 ancestor_size += sk_from->sk_prot->ob <<
9525 ancestor_size -= offsetof(struct sctp <<
9526 __inet_sk_copy_descendant(sk_to, sk_f 9464 __inet_sk_copy_descendant(sk_to, sk_from, ancestor_size);
9527 } 9465 }
9528 9466
9529 /* Populate the fields of the newsk from the 9467 /* Populate the fields of the newsk from the oldsk and migrate the assoc
9530 * and its messages to the newsk. 9468 * and its messages to the newsk.
9531 */ 9469 */
9532 static int sctp_sock_migrate(struct sock *old 9470 static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
9533 struct sctp_asso 9471 struct sctp_association *assoc,
9534 enum sctp_socket 9472 enum sctp_socket_type type)
9535 { 9473 {
9536 struct sctp_sock *oldsp = sctp_sk(old 9474 struct sctp_sock *oldsp = sctp_sk(oldsk);
9537 struct sctp_sock *newsp = sctp_sk(new 9475 struct sctp_sock *newsp = sctp_sk(newsk);
9538 struct sctp_bind_bucket *pp; /* hash 9476 struct sctp_bind_bucket *pp; /* hash list port iterator */
9539 struct sctp_endpoint *newep = newsp-> 9477 struct sctp_endpoint *newep = newsp->ep;
9540 struct sk_buff *skb, *tmp; 9478 struct sk_buff *skb, *tmp;
9541 struct sctp_ulpevent *event; 9479 struct sctp_ulpevent *event;
9542 struct sctp_bind_hashbucket *head; 9480 struct sctp_bind_hashbucket *head;
9543 int err; 9481 int err;
9544 9482
9545 /* Migrate socket buffer sizes and al 9483 /* Migrate socket buffer sizes and all the socket level options to the
9546 * new socket. 9484 * new socket.
9547 */ 9485 */
9548 newsk->sk_sndbuf = oldsk->sk_sndbuf; 9486 newsk->sk_sndbuf = oldsk->sk_sndbuf;
9549 newsk->sk_rcvbuf = oldsk->sk_rcvbuf; 9487 newsk->sk_rcvbuf = oldsk->sk_rcvbuf;
9550 /* Brute force copy old sctp opt. */ 9488 /* Brute force copy old sctp opt. */
9551 sctp_copy_descendant(newsk, oldsk); 9489 sctp_copy_descendant(newsk, oldsk);
9552 9490
9553 /* Restore the ep value that was over 9491 /* Restore the ep value that was overwritten with the above structure
9554 * copy. 9492 * copy.
9555 */ 9493 */
9556 newsp->ep = newep; 9494 newsp->ep = newep;
9557 newsp->hmac = NULL; 9495 newsp->hmac = NULL;
9558 9496
9559 /* Hook this new socket in to the bin 9497 /* Hook this new socket in to the bind_hash list. */
9560 head = &sctp_port_hashtable[sctp_phas 9498 head = &sctp_port_hashtable[sctp_phashfn(sock_net(oldsk),
9561 9499 inet_sk(oldsk)->inet_num)];
9562 spin_lock_bh(&head->lock); 9500 spin_lock_bh(&head->lock);
9563 pp = sctp_sk(oldsk)->bind_hash; 9501 pp = sctp_sk(oldsk)->bind_hash;
9564 sk_add_bind_node(newsk, &pp->owner); 9502 sk_add_bind_node(newsk, &pp->owner);
9565 sctp_sk(newsk)->bind_hash = pp; 9503 sctp_sk(newsk)->bind_hash = pp;
9566 inet_sk(newsk)->inet_num = inet_sk(ol 9504 inet_sk(newsk)->inet_num = inet_sk(oldsk)->inet_num;
9567 spin_unlock_bh(&head->lock); 9505 spin_unlock_bh(&head->lock);
9568 9506
9569 /* Copy the bind_addr list from the o 9507 /* Copy the bind_addr list from the original endpoint to the new
9570 * endpoint so that we can handle res 9508 * endpoint so that we can handle restarts properly
9571 */ 9509 */
9572 err = sctp_bind_addr_dup(&newsp->ep-> 9510 err = sctp_bind_addr_dup(&newsp->ep->base.bind_addr,
9573 &oldsp->ep-> 9511 &oldsp->ep->base.bind_addr, GFP_KERNEL);
9574 if (err) 9512 if (err)
9575 return err; 9513 return err;
9576 9514
9577 /* New ep's auth_hmacs should be set 9515 /* New ep's auth_hmacs should be set if old ep's is set, in case
9578 * that net->sctp.auth_enable has bee 9516 * that net->sctp.auth_enable has been changed to 0 by users and
9579 * new ep's auth_hmacs couldn't be se 9517 * new ep's auth_hmacs couldn't be set in sctp_endpoint_init().
9580 */ 9518 */
9581 if (oldsp->ep->auth_hmacs) { 9519 if (oldsp->ep->auth_hmacs) {
9582 err = sctp_auth_init_hmacs(ne 9520 err = sctp_auth_init_hmacs(newsp->ep, GFP_KERNEL);
9583 if (err) 9521 if (err)
9584 return err; 9522 return err;
9585 } 9523 }
9586 9524
9587 sctp_auto_asconf_init(newsp); <<
9588 <<
9589 /* Move any messages in the old socke 9525 /* Move any messages in the old socket's receive queue that are for the
9590 * peeled off association to the new 9526 * peeled off association to the new socket's receive queue.
9591 */ 9527 */
9592 sctp_skb_for_each(skb, &oldsk->sk_rec 9528 sctp_skb_for_each(skb, &oldsk->sk_receive_queue, tmp) {
9593 event = sctp_skb2event(skb); 9529 event = sctp_skb2event(skb);
9594 if (event->asoc == assoc) { 9530 if (event->asoc == assoc) {
9595 __skb_unlink(skb, &ol 9531 __skb_unlink(skb, &oldsk->sk_receive_queue);
9596 __skb_queue_tail(&new 9532 __skb_queue_tail(&newsk->sk_receive_queue, skb);
9597 sctp_skb_set_owner_r_ 9533 sctp_skb_set_owner_r_frag(skb, newsk);
9598 } 9534 }
9599 } 9535 }
9600 9536
9601 /* Clean up any messages pending deli 9537 /* Clean up any messages pending delivery due to partial
9602 * delivery. Three cases: 9538 * delivery. Three cases:
9603 * 1) No partial deliver; no work. 9539 * 1) No partial deliver; no work.
9604 * 2) Peeling off partial delivery; k 9540 * 2) Peeling off partial delivery; keep pd_lobby in new pd_lobby.
9605 * 3) Peeling off non-partial deliver 9541 * 3) Peeling off non-partial delivery; move pd_lobby to receive_queue.
9606 */ 9542 */
9607 atomic_set(&sctp_sk(newsk)->pd_mode, 9543 atomic_set(&sctp_sk(newsk)->pd_mode, assoc->ulpq.pd_mode);
9608 9544
9609 if (atomic_read(&sctp_sk(oldsk)->pd_m 9545 if (atomic_read(&sctp_sk(oldsk)->pd_mode)) {
9610 struct sk_buff_head *queue; 9546 struct sk_buff_head *queue;
9611 9547
9612 /* Decide which queue to move 9548 /* Decide which queue to move pd_lobby skbs to. */
9613 if (assoc->ulpq.pd_mode) { 9549 if (assoc->ulpq.pd_mode) {
9614 queue = &newsp->pd_lo 9550 queue = &newsp->pd_lobby;
9615 } else 9551 } else
9616 queue = &newsk->sk_re 9552 queue = &newsk->sk_receive_queue;
9617 9553
9618 /* Walk through the pd_lobby, 9554 /* Walk through the pd_lobby, looking for skbs that
9619 * need moved to the new sock 9555 * need moved to the new socket.
9620 */ 9556 */
9621 sctp_skb_for_each(skb, &oldsp 9557 sctp_skb_for_each(skb, &oldsp->pd_lobby, tmp) {
9622 event = sctp_skb2even 9558 event = sctp_skb2event(skb);
9623 if (event->asoc == as 9559 if (event->asoc == assoc) {
9624 __skb_unlink( 9560 __skb_unlink(skb, &oldsp->pd_lobby);
9625 __skb_queue_t 9561 __skb_queue_tail(queue, skb);
9626 sctp_skb_set_ 9562 sctp_skb_set_owner_r_frag(skb, newsk);
9627 } 9563 }
9628 } 9564 }
9629 9565
9630 /* Clear up any skbs waiting 9566 /* Clear up any skbs waiting for the partial
9631 * delivery to finish. 9567 * delivery to finish.
9632 */ 9568 */
9633 if (assoc->ulpq.pd_mode) 9569 if (assoc->ulpq.pd_mode)
9634 sctp_clear_pd(oldsk, 9570 sctp_clear_pd(oldsk, NULL);
9635 9571
9636 } 9572 }
9637 9573
9638 sctp_for_each_rx_skb(assoc, newsk, sc 9574 sctp_for_each_rx_skb(assoc, newsk, sctp_skb_set_owner_r_frag);
9639 9575
9640 /* Set the type of socket to indicate 9576 /* Set the type of socket to indicate that it is peeled off from the
9641 * original UDP-style socket or creat 9577 * original UDP-style socket or created with the accept() call on a
9642 * TCP-style socket.. 9578 * TCP-style socket..
9643 */ 9579 */
9644 newsp->type = type; 9580 newsp->type = type;
9645 9581
9646 /* Mark the new socket "in-use" by th 9582 /* Mark the new socket "in-use" by the user so that any packets
9647 * that may arrive on the association 9583 * that may arrive on the association after we've moved it are
9648 * queued to the backlog. This preve 9584 * queued to the backlog. This prevents a potential race between
9649 * backlog processing on the old sock 9585 * backlog processing on the old socket and new-packet processing
9650 * on the new socket. 9586 * on the new socket.
9651 * 9587 *
9652 * The caller has just allocated news 9588 * The caller has just allocated newsk so we can guarantee that other
9653 * paths won't try to lock it and the 9589 * paths won't try to lock it and then oldsk.
9654 */ 9590 */
9655 lock_sock_nested(newsk, SINGLE_DEPTH_ 9591 lock_sock_nested(newsk, SINGLE_DEPTH_NESTING);
9656 sctp_for_each_tx_datachunk(assoc, tru 9592 sctp_for_each_tx_datachunk(assoc, true, sctp_clear_owner_w);
9657 sctp_assoc_migrate(assoc, newsk); 9593 sctp_assoc_migrate(assoc, newsk);
9658 sctp_for_each_tx_datachunk(assoc, fal 9594 sctp_for_each_tx_datachunk(assoc, false, sctp_set_owner_w);
9659 9595
9660 /* If the association on the newsk is 9596 /* If the association on the newsk is already closed before accept()
9661 * is called, set RCV_SHUTDOWN flag. 9597 * is called, set RCV_SHUTDOWN flag.
9662 */ 9598 */
9663 if (sctp_state(assoc, CLOSED) && sctp 9599 if (sctp_state(assoc, CLOSED) && sctp_style(newsk, TCP)) {
9664 inet_sk_set_state(newsk, SCTP 9600 inet_sk_set_state(newsk, SCTP_SS_CLOSED);
9665 newsk->sk_shutdown |= RCV_SHU 9601 newsk->sk_shutdown |= RCV_SHUTDOWN;
9666 } else { 9602 } else {
9667 inet_sk_set_state(newsk, SCTP 9603 inet_sk_set_state(newsk, SCTP_SS_ESTABLISHED);
9668 } 9604 }
9669 9605
9670 release_sock(newsk); 9606 release_sock(newsk);
9671 9607
9672 return 0; 9608 return 0;
9673 } 9609 }
9674 9610
9675 9611
9676 /* This proto struct describes the ULP interf 9612 /* This proto struct describes the ULP interface for SCTP. */
9677 struct proto sctp_prot = { 9613 struct proto sctp_prot = {
9678 .name = "SCTP", 9614 .name = "SCTP",
9679 .owner = THIS_MODULE, 9615 .owner = THIS_MODULE,
9680 .close = sctp_close, 9616 .close = sctp_close,
9681 .disconnect = sctp_disconnect, 9617 .disconnect = sctp_disconnect,
9682 .accept = sctp_accept, 9618 .accept = sctp_accept,
9683 .ioctl = sctp_ioctl, 9619 .ioctl = sctp_ioctl,
9684 .init = sctp_init_sock, 9620 .init = sctp_init_sock,
9685 .destroy = sctp_destroy_sock, 9621 .destroy = sctp_destroy_sock,
9686 .shutdown = sctp_shutdown, 9622 .shutdown = sctp_shutdown,
9687 .setsockopt = sctp_setsockopt, 9623 .setsockopt = sctp_setsockopt,
9688 .getsockopt = sctp_getsockopt, 9624 .getsockopt = sctp_getsockopt,
9689 .bpf_bypass_getsockopt = sctp_bpf_by <<
9690 .sendmsg = sctp_sendmsg, 9625 .sendmsg = sctp_sendmsg,
9691 .recvmsg = sctp_recvmsg, 9626 .recvmsg = sctp_recvmsg,
9692 .bind = sctp_bind, 9627 .bind = sctp_bind,
9693 .bind_add = sctp_bind_add, <<
9694 .backlog_rcv = sctp_backlog_rcv, 9628 .backlog_rcv = sctp_backlog_rcv,
9695 .hash = sctp_hash, 9629 .hash = sctp_hash,
9696 .unhash = sctp_unhash, 9630 .unhash = sctp_unhash,
9697 .no_autobind = true, 9631 .no_autobind = true,
9698 .obj_size = sizeof(struct sctp_so 9632 .obj_size = sizeof(struct sctp_sock),
9699 .useroffset = offsetof(struct sctp_ 9633 .useroffset = offsetof(struct sctp_sock, subscribe),
9700 .usersize = offsetof(struct sctp_ 9634 .usersize = offsetof(struct sctp_sock, initmsg) -
9701 offsetof(stru 9635 offsetof(struct sctp_sock, subscribe) +
9702 sizeof_field( 9636 sizeof_field(struct sctp_sock, initmsg),
9703 .sysctl_mem = sysctl_sctp_mem, 9637 .sysctl_mem = sysctl_sctp_mem,
9704 .sysctl_rmem = sysctl_sctp_rmem, 9638 .sysctl_rmem = sysctl_sctp_rmem,
9705 .sysctl_wmem = sysctl_sctp_wmem, 9639 .sysctl_wmem = sysctl_sctp_wmem,
9706 .memory_pressure = &sctp_memory_press 9640 .memory_pressure = &sctp_memory_pressure,
9707 .enter_memory_pressure = sctp_enter_m 9641 .enter_memory_pressure = sctp_enter_memory_pressure,
9708 <<
9709 .memory_allocated = &sctp_memory_allo 9642 .memory_allocated = &sctp_memory_allocated,
9710 .per_cpu_fw_alloc = &sctp_memory_per_ <<
9711 <<
9712 .sockets_allocated = &sctp_sockets_al 9643 .sockets_allocated = &sctp_sockets_allocated,
9713 }; 9644 };
9714 9645
9715 #if IS_ENABLED(CONFIG_IPV6) 9646 #if IS_ENABLED(CONFIG_IPV6)
9716 9647
9717 static void sctp_v6_destruct_sock(struct sock !! 9648 #include <net/transp_v6.h>
>> 9649 static void sctp_v6_destroy_sock(struct sock *sk)
9718 { 9650 {
9719 sctp_destruct_common(sk); !! 9651 sctp_destroy_sock(sk);
9720 inet6_sock_destruct(sk); !! 9652 inet6_destroy_sock(sk);
9721 } <<
9722 <<
9723 static int sctp_v6_init_sock(struct sock *sk) <<
9724 { <<
9725 int ret = sctp_init_sock(sk); <<
9726 <<
9727 if (!ret) <<
9728 sk->sk_destruct = sctp_v6_des <<
9729 <<
9730 return ret; <<
9731 } 9653 }
9732 9654
9733 struct proto sctpv6_prot = { 9655 struct proto sctpv6_prot = {
9734 .name = "SCTPv6", 9656 .name = "SCTPv6",
9735 .owner = THIS_MODULE, 9657 .owner = THIS_MODULE,
9736 .close = sctp_close, 9658 .close = sctp_close,
9737 .disconnect = sctp_disconnect, 9659 .disconnect = sctp_disconnect,
9738 .accept = sctp_accept, 9660 .accept = sctp_accept,
9739 .ioctl = sctp_ioctl, 9661 .ioctl = sctp_ioctl,
9740 .init = sctp_v6_init_sock, !! 9662 .init = sctp_init_sock,
9741 .destroy = sctp_destroy_sock, !! 9663 .destroy = sctp_v6_destroy_sock,
9742 .shutdown = sctp_shutdown, 9664 .shutdown = sctp_shutdown,
9743 .setsockopt = sctp_setsockopt, 9665 .setsockopt = sctp_setsockopt,
9744 .getsockopt = sctp_getsockopt, 9666 .getsockopt = sctp_getsockopt,
9745 .bpf_bypass_getsockopt = sctp_bpf_by <<
9746 .sendmsg = sctp_sendmsg, 9667 .sendmsg = sctp_sendmsg,
9747 .recvmsg = sctp_recvmsg, 9668 .recvmsg = sctp_recvmsg,
9748 .bind = sctp_bind, 9669 .bind = sctp_bind,
9749 .bind_add = sctp_bind_add, <<
9750 .backlog_rcv = sctp_backlog_rcv, 9670 .backlog_rcv = sctp_backlog_rcv,
9751 .hash = sctp_hash, 9671 .hash = sctp_hash,
9752 .unhash = sctp_unhash, 9672 .unhash = sctp_unhash,
9753 .no_autobind = true, 9673 .no_autobind = true,
9754 .obj_size = sizeof(struct sctp6 9674 .obj_size = sizeof(struct sctp6_sock),
9755 .ipv6_pinfo_offset = offsetof(struct <<
9756 .useroffset = offsetof(struct sct 9675 .useroffset = offsetof(struct sctp6_sock, sctp.subscribe),
9757 .usersize = offsetof(struct sct 9676 .usersize = offsetof(struct sctp6_sock, sctp.initmsg) -
9758 offsetof(stru 9677 offsetof(struct sctp6_sock, sctp.subscribe) +
9759 sizeof_field( 9678 sizeof_field(struct sctp6_sock, sctp.initmsg),
9760 .sysctl_mem = sysctl_sctp_mem, 9679 .sysctl_mem = sysctl_sctp_mem,
9761 .sysctl_rmem = sysctl_sctp_rmem, 9680 .sysctl_rmem = sysctl_sctp_rmem,
9762 .sysctl_wmem = sysctl_sctp_wmem, 9681 .sysctl_wmem = sysctl_sctp_wmem,
9763 .memory_pressure = &sctp_memory_press 9682 .memory_pressure = &sctp_memory_pressure,
9764 .enter_memory_pressure = sctp_enter_m 9683 .enter_memory_pressure = sctp_enter_memory_pressure,
9765 <<
9766 .memory_allocated = &sctp_memory_allo 9684 .memory_allocated = &sctp_memory_allocated,
9767 .per_cpu_fw_alloc = &sctp_memory_per_ <<
9768 <<
9769 .sockets_allocated = &sctp_sockets_al 9685 .sockets_allocated = &sctp_sockets_allocated,
9770 }; 9686 };
9771 #endif /* IS_ENABLED(CONFIG_IPV6) */ 9687 #endif /* IS_ENABLED(CONFIG_IPV6) */
9772 9688
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.