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(const 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 WRITE_ONCE(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_wmem_queued_add(sk, 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_ 360 static void sctp_auto_asconf_init(struct sctp_sock *sp)
364 { 361 {
365 struct net *net = sock_net(&sp->inet.s 362 struct net *net = sock_net(&sp->inet.sk);
366 363
367 if (net->sctp.default_auto_asconf) { 364 if (net->sctp.default_auto_asconf) {
368 spin_lock_bh(&net->sctp.addr_w 365 spin_lock_bh(&net->sctp.addr_wq_lock);
369 list_add_tail(&sp->auto_asconf 366 list_add_tail(&sp->auto_asconf_list, &net->sctp.auto_asconf_splist);
370 spin_unlock_bh(&net->sctp.addr 367 spin_unlock_bh(&net->sctp.addr_wq_lock);
371 sp->do_auto_asconf = 1; 368 sp->do_auto_asconf = 1;
372 } 369 }
373 } 370 }
374 371
375 /* Bind a local address either to an endpoint 372 /* Bind a local address either to an endpoint or to an association. */
376 static int sctp_do_bind(struct sock *sk, union 373 static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
377 { 374 {
378 struct net *net = sock_net(sk); 375 struct net *net = sock_net(sk);
379 struct sctp_sock *sp = sctp_sk(sk); 376 struct sctp_sock *sp = sctp_sk(sk);
380 struct sctp_endpoint *ep = sp->ep; 377 struct sctp_endpoint *ep = sp->ep;
381 struct sctp_bind_addr *bp = &ep->base. 378 struct sctp_bind_addr *bp = &ep->base.bind_addr;
382 struct sctp_af *af; 379 struct sctp_af *af;
383 unsigned short snum; 380 unsigned short snum;
384 int ret = 0; 381 int ret = 0;
385 382
386 /* Common sockaddr verification. */ 383 /* Common sockaddr verification. */
387 af = sctp_sockaddr_af(sp, addr, len); 384 af = sctp_sockaddr_af(sp, addr, len);
388 if (!af) { 385 if (!af) {
389 pr_debug("%s: sk:%p, newaddr:% 386 pr_debug("%s: sk:%p, newaddr:%p, len:%d EINVAL\n",
390 __func__, sk, addr, l 387 __func__, sk, addr, len);
391 return -EINVAL; 388 return -EINVAL;
392 } 389 }
393 390
394 snum = ntohs(addr->v4.sin_port); 391 snum = ntohs(addr->v4.sin_port);
395 392
396 pr_debug("%s: sk:%p, new addr:%pISc, p 393 pr_debug("%s: sk:%p, new addr:%pISc, port:%d, new port:%d, len:%d\n",
397 __func__, sk, &addr->sa, bp-> 394 __func__, sk, &addr->sa, bp->port, snum, len);
398 395
399 /* PF specific bind() address verifica 396 /* PF specific bind() address verification. */
400 if (!sp->pf->bind_verify(sp, addr)) 397 if (!sp->pf->bind_verify(sp, addr))
401 return -EADDRNOTAVAIL; 398 return -EADDRNOTAVAIL;
402 399
403 /* We must either be unbound, or bind 400 /* We must either be unbound, or bind to the same port.
404 * It's OK to allow 0 ports if we are 401 * It's OK to allow 0 ports if we are already bound.
405 * We'll just inhert an already bound 402 * We'll just inhert an already bound port in this case
406 */ 403 */
407 if (bp->port) { 404 if (bp->port) {
408 if (!snum) 405 if (!snum)
409 snum = bp->port; 406 snum = bp->port;
410 else if (snum != bp->port) { 407 else if (snum != bp->port) {
411 pr_debug("%s: new port 408 pr_debug("%s: new port %d doesn't match existing port "
412 "%d\n", __fun 409 "%d\n", __func__, snum, bp->port);
413 return -EINVAL; 410 return -EINVAL;
414 } 411 }
415 } 412 }
416 413
417 if (snum && inet_port_requires_bind_se !! 414 if (snum && snum < inet_prot_sock(net) &&
418 !ns_capable(net->user_ns, CAP_NET_ 415 !ns_capable(net->user_ns, CAP_NET_BIND_SERVICE))
419 return -EACCES; 416 return -EACCES;
420 417
421 /* See if the address matches any of t 418 /* See if the address matches any of the addresses we may have
422 * already bound before checking again 419 * already bound before checking against other endpoints.
423 */ 420 */
424 if (sctp_bind_addr_match(bp, addr, sp) 421 if (sctp_bind_addr_match(bp, addr, sp))
425 return -EINVAL; 422 return -EINVAL;
426 423
427 /* Make sure we are allowed to bind he 424 /* Make sure we are allowed to bind here.
428 * The function sctp_get_port_local() 425 * The function sctp_get_port_local() does duplicate address
429 * detection. 426 * detection.
430 */ 427 */
431 addr->v4.sin_port = htons(snum); 428 addr->v4.sin_port = htons(snum);
432 if (sctp_get_port_local(sk, addr)) 429 if (sctp_get_port_local(sk, addr))
433 return -EADDRINUSE; 430 return -EADDRINUSE;
434 431
435 /* Refresh ephemeral port. */ 432 /* Refresh ephemeral port. */
436 if (!bp->port) { 433 if (!bp->port) {
437 bp->port = inet_sk(sk)->inet_n 434 bp->port = inet_sk(sk)->inet_num;
438 sctp_auto_asconf_init(sp); 435 sctp_auto_asconf_init(sp);
439 } 436 }
440 437
441 /* Add the address to the bind address 438 /* Add the address to the bind address list.
442 * Use GFP_ATOMIC since BHs will be di 439 * Use GFP_ATOMIC since BHs will be disabled.
443 */ 440 */
444 ret = sctp_add_bind_addr(bp, addr, af- 441 ret = sctp_add_bind_addr(bp, addr, af->sockaddr_len,
445 SCTP_ADDR_SRC 442 SCTP_ADDR_SRC, GFP_ATOMIC);
446 443
447 if (ret) { 444 if (ret) {
448 sctp_put_port(sk); 445 sctp_put_port(sk);
449 return ret; 446 return ret;
450 } 447 }
451 /* Copy back into socket for getsockna 448 /* Copy back into socket for getsockname() use. */
452 inet_sk(sk)->inet_sport = htons(inet_s 449 inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
453 sp->pf->to_sk_saddr(addr, sk); 450 sp->pf->to_sk_saddr(addr, sk);
454 451
455 return ret; 452 return ret;
456 } 453 }
457 454
458 /* ADDIP Section 4.1.1 Congestion Control of 455 /* ADDIP Section 4.1.1 Congestion Control of ASCONF Chunks
459 * 456 *
460 * R1) One and only one ASCONF Chunk MAY be in 457 * R1) One and only one ASCONF Chunk MAY be in transit and unacknowledged
461 * at any one time. If a sender, after sendin 458 * at any one time. If a sender, after sending an ASCONF chunk, decides
462 * it needs to transfer another ASCONF Chunk, 459 * it needs to transfer another ASCONF Chunk, it MUST wait until the
463 * ASCONF-ACK Chunk returns from the previous 460 * ASCONF-ACK Chunk returns from the previous ASCONF Chunk before sending a
464 * subsequent ASCONF. Note this restriction bi 461 * subsequent ASCONF. Note this restriction binds each side, so at any
465 * time two ASCONF may be in-transit on any gi 462 * time two ASCONF may be in-transit on any given association (one sent
466 * from each endpoint). 463 * from each endpoint).
467 */ 464 */
468 static int sctp_send_asconf(struct sctp_associ 465 static int sctp_send_asconf(struct sctp_association *asoc,
469 struct sctp_chunk 466 struct sctp_chunk *chunk)
470 { 467 {
471 int retval = 0; !! 468 struct net *net = sock_net(asoc->base.sk);
>> 469 int retval = 0;
472 470
473 /* If there is an outstanding ASCONF c 471 /* If there is an outstanding ASCONF chunk, queue it for later
474 * transmission. 472 * transmission.
475 */ 473 */
476 if (asoc->addip_last_asconf) { 474 if (asoc->addip_last_asconf) {
477 list_add_tail(&chunk->list, &a 475 list_add_tail(&chunk->list, &asoc->addip_chunk_list);
478 goto out; 476 goto out;
479 } 477 }
480 478
481 /* Hold the chunk until an ASCONF_ACK 479 /* Hold the chunk until an ASCONF_ACK is received. */
482 sctp_chunk_hold(chunk); 480 sctp_chunk_hold(chunk);
483 retval = sctp_primitive_ASCONF(asoc->b !! 481 retval = sctp_primitive_ASCONF(net, asoc, chunk);
484 if (retval) 482 if (retval)
485 sctp_chunk_free(chunk); 483 sctp_chunk_free(chunk);
486 else 484 else
487 asoc->addip_last_asconf = chun 485 asoc->addip_last_asconf = chunk;
488 486
489 out: 487 out:
490 return retval; 488 return retval;
491 } 489 }
492 490
493 /* Add a list of addresses as bind addresses t 491 /* Add a list of addresses as bind addresses to local endpoint or
494 * association. 492 * association.
495 * 493 *
496 * Basically run through each address specifie 494 * Basically run through each address specified in the addrs/addrcnt
497 * array/length pair, determine if it is IPv6 495 * array/length pair, determine if it is IPv6 or IPv4 and call
498 * sctp_do_bind() on it. 496 * sctp_do_bind() on it.
499 * 497 *
500 * If any of them fails, then the operation wi 498 * If any of them fails, then the operation will be reversed and the
501 * ones that were added will be removed. 499 * ones that were added will be removed.
502 * 500 *
503 * Only sctp_setsockopt_bindx() is supposed to 501 * Only sctp_setsockopt_bindx() is supposed to call this function.
504 */ 502 */
505 static int sctp_bindx_add(struct sock *sk, str 503 static int sctp_bindx_add(struct sock *sk, struct sockaddr *addrs, int addrcnt)
506 { 504 {
507 int cnt; 505 int cnt;
508 int retval = 0; 506 int retval = 0;
509 void *addr_buf; 507 void *addr_buf;
510 struct sockaddr *sa_addr; 508 struct sockaddr *sa_addr;
511 struct sctp_af *af; 509 struct sctp_af *af;
512 510
513 pr_debug("%s: sk:%p, addrs:%p, addrcnt 511 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n", __func__, sk,
514 addrs, addrcnt); 512 addrs, addrcnt);
515 513
516 addr_buf = addrs; 514 addr_buf = addrs;
517 for (cnt = 0; cnt < addrcnt; cnt++) { 515 for (cnt = 0; cnt < addrcnt; cnt++) {
518 /* The list may contain either 516 /* The list may contain either IPv4 or IPv6 address;
519 * determine the address lengt 517 * determine the address length for walking thru the list.
520 */ 518 */
521 sa_addr = addr_buf; 519 sa_addr = addr_buf;
522 af = sctp_get_af_specific(sa_a 520 af = sctp_get_af_specific(sa_addr->sa_family);
523 if (!af) { 521 if (!af) {
524 retval = -EINVAL; 522 retval = -EINVAL;
525 goto err_bindx_add; 523 goto err_bindx_add;
526 } 524 }
527 525
528 retval = sctp_do_bind(sk, (uni 526 retval = sctp_do_bind(sk, (union sctp_addr *)sa_addr,
529 af->sock 527 af->sockaddr_len);
530 528
531 addr_buf += af->sockaddr_len; 529 addr_buf += af->sockaddr_len;
532 530
533 err_bindx_add: 531 err_bindx_add:
534 if (retval < 0) { 532 if (retval < 0) {
535 /* Failed. Cleanup the 533 /* Failed. Cleanup the ones that have been added */
536 if (cnt > 0) 534 if (cnt > 0)
537 sctp_bindx_rem 535 sctp_bindx_rem(sk, addrs, cnt);
538 return retval; 536 return retval;
539 } 537 }
540 } 538 }
541 539
542 return retval; 540 return retval;
543 } 541 }
544 542
545 /* Send an ASCONF chunk with Add IP address pa 543 /* Send an ASCONF chunk with Add IP address parameters to all the peers of the
546 * associations that are part of the endpoint 544 * associations that are part of the endpoint indicating that a list of local
547 * addresses are added to the endpoint. 545 * addresses are added to the endpoint.
548 * 546 *
549 * If any of the addresses is already in the b 547 * If any of the addresses is already in the bind address list of the
550 * association, we do not send the chunk for t 548 * association, we do not send the chunk for that association. But it will not
551 * affect other associations. 549 * affect other associations.
552 * 550 *
553 * Only sctp_setsockopt_bindx() is supposed to 551 * Only sctp_setsockopt_bindx() is supposed to call this function.
554 */ 552 */
555 static int sctp_send_asconf_add_ip(struct sock 553 static int sctp_send_asconf_add_ip(struct sock *sk,
556 struct sock 554 struct sockaddr *addrs,
557 int 555 int addrcnt)
558 { 556 {
559 struct sctp_sock *sp; 557 struct sctp_sock *sp;
560 struct sctp_endpoint *ep; 558 struct sctp_endpoint *ep;
561 struct sctp_association *asoc; 559 struct sctp_association *asoc;
562 struct sctp_bind_addr *bp; 560 struct sctp_bind_addr *bp;
563 struct sctp_chunk *chunk 561 struct sctp_chunk *chunk;
564 struct sctp_sockaddr_entry *laddr 562 struct sctp_sockaddr_entry *laddr;
565 union sctp_addr *addr; 563 union sctp_addr *addr;
566 union sctp_addr savead 564 union sctp_addr saveaddr;
567 void *addr_ 565 void *addr_buf;
568 struct sctp_af *af; 566 struct sctp_af *af;
569 struct list_head *p; 567 struct list_head *p;
570 int i; 568 int i;
571 int retval 569 int retval = 0;
572 570
573 sp = sctp_sk(sk); 571 sp = sctp_sk(sk);
574 ep = sp->ep; 572 ep = sp->ep;
575 573
576 if (!ep->asconf_enable) 574 if (!ep->asconf_enable)
577 return retval; 575 return retval;
578 576
579 pr_debug("%s: sk:%p, addrs:%p, addrcnt 577 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
580 __func__, sk, addrs, addrcnt) 578 __func__, sk, addrs, addrcnt);
581 579
582 list_for_each_entry(asoc, &ep->asocs, 580 list_for_each_entry(asoc, &ep->asocs, asocs) {
583 if (!asoc->peer.asconf_capable 581 if (!asoc->peer.asconf_capable)
584 continue; 582 continue;
585 583
586 if (asoc->peer.addip_disabled_ 584 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_ADD_IP)
587 continue; 585 continue;
588 586
589 if (!sctp_state(asoc, ESTABLIS 587 if (!sctp_state(asoc, ESTABLISHED))
590 continue; 588 continue;
591 589
592 /* Check if any address in the 590 /* Check if any address in the packed array of addresses is
593 * in the bind address list of 591 * in the bind address list of the association. If so,
594 * do not send the asconf chun 592 * do not send the asconf chunk to its peer, but continue with
595 * other associations. 593 * other associations.
596 */ 594 */
597 addr_buf = addrs; 595 addr_buf = addrs;
598 for (i = 0; i < addrcnt; i++) 596 for (i = 0; i < addrcnt; i++) {
599 addr = addr_buf; 597 addr = addr_buf;
600 af = sctp_get_af_speci 598 af = sctp_get_af_specific(addr->v4.sin_family);
601 if (!af) { 599 if (!af) {
602 retval = -EINV 600 retval = -EINVAL;
603 goto out; 601 goto out;
604 } 602 }
605 603
606 if (sctp_assoc_lookup_ 604 if (sctp_assoc_lookup_laddr(asoc, addr))
607 break; 605 break;
608 606
609 addr_buf += af->sockad 607 addr_buf += af->sockaddr_len;
610 } 608 }
611 if (i < addrcnt) 609 if (i < addrcnt)
612 continue; 610 continue;
613 611
614 /* Use the first valid address 612 /* Use the first valid address in bind addr list of
615 * association as Address Para 613 * association as Address Parameter of ASCONF CHUNK.
616 */ 614 */
617 bp = &asoc->base.bind_addr; 615 bp = &asoc->base.bind_addr;
618 p = bp->address_list.next; 616 p = bp->address_list.next;
619 laddr = list_entry(p, struct s 617 laddr = list_entry(p, struct sctp_sockaddr_entry, list);
620 chunk = sctp_make_asconf_updat 618 chunk = sctp_make_asconf_update_ip(asoc, &laddr->a, addrs,
621 619 addrcnt, SCTP_PARAM_ADD_IP);
622 if (!chunk) { 620 if (!chunk) {
623 retval = -ENOMEM; 621 retval = -ENOMEM;
624 goto out; 622 goto out;
625 } 623 }
626 624
627 /* Add the new addresses to th 625 /* Add the new addresses to the bind address list with
628 * use_as_src set to 0. 626 * use_as_src set to 0.
629 */ 627 */
630 addr_buf = addrs; 628 addr_buf = addrs;
631 for (i = 0; i < addrcnt; i++) 629 for (i = 0; i < addrcnt; i++) {
632 addr = addr_buf; 630 addr = addr_buf;
633 af = sctp_get_af_speci 631 af = sctp_get_af_specific(addr->v4.sin_family);
634 memcpy(&saveaddr, addr 632 memcpy(&saveaddr, addr, af->sockaddr_len);
635 retval = sctp_add_bind 633 retval = sctp_add_bind_addr(bp, &saveaddr,
636 634 sizeof(saveaddr),
637 635 SCTP_ADDR_NEW, GFP_ATOMIC);
638 addr_buf += af->sockad 636 addr_buf += af->sockaddr_len;
639 } 637 }
640 if (asoc->src_out_of_asoc_ok) 638 if (asoc->src_out_of_asoc_ok) {
641 struct sctp_transport 639 struct sctp_transport *trans;
642 640
643 list_for_each_entry(tr 641 list_for_each_entry(trans,
644 &asoc->peer.transp 642 &asoc->peer.transport_addr_list, transports) {
645 trans->cwnd = 643 trans->cwnd = min(4*asoc->pathmtu, max_t(__u32,
646 2*asoc->pa 644 2*asoc->pathmtu, 4380));
647 trans->ssthres 645 trans->ssthresh = asoc->peer.i.a_rwnd;
648 trans->rto = a 646 trans->rto = asoc->rto_initial;
649 sctp_max_rto(a 647 sctp_max_rto(asoc, trans);
650 trans->rtt = t 648 trans->rtt = trans->srtt = trans->rttvar = 0;
651 /* Clear the s 649 /* Clear the source and route cache */
652 sctp_transport 650 sctp_transport_route(trans, NULL,
653 651 sctp_sk(asoc->base.sk));
654 } 652 }
655 } 653 }
656 retval = sctp_send_asconf(asoc 654 retval = sctp_send_asconf(asoc, chunk);
657 } 655 }
658 656
659 out: 657 out:
660 return retval; 658 return retval;
661 } 659 }
662 660
663 /* Remove a list of addresses from bind addres 661 /* Remove a list of addresses from bind addresses list. Do not remove the
664 * last address. 662 * last address.
665 * 663 *
666 * Basically run through each address specifie 664 * Basically run through each address specified in the addrs/addrcnt
667 * array/length pair, determine if it is IPv6 665 * array/length pair, determine if it is IPv6 or IPv4 and call
668 * sctp_del_bind() on it. 666 * sctp_del_bind() on it.
669 * 667 *
670 * If any of them fails, then the operation wi 668 * If any of them fails, then the operation will be reversed and the
671 * ones that were removed will be added back. 669 * ones that were removed will be added back.
672 * 670 *
673 * At least one address has to be left; if onl 671 * At least one address has to be left; if only one address is
674 * available, the operation will return -EBUSY 672 * available, the operation will return -EBUSY.
675 * 673 *
676 * Only sctp_setsockopt_bindx() is supposed to 674 * Only sctp_setsockopt_bindx() is supposed to call this function.
677 */ 675 */
678 static int sctp_bindx_rem(struct sock *sk, str 676 static int sctp_bindx_rem(struct sock *sk, struct sockaddr *addrs, int addrcnt)
679 { 677 {
680 struct sctp_sock *sp = sctp_sk(sk); 678 struct sctp_sock *sp = sctp_sk(sk);
681 struct sctp_endpoint *ep = sp->ep; 679 struct sctp_endpoint *ep = sp->ep;
682 int cnt; 680 int cnt;
683 struct sctp_bind_addr *bp = &ep->base. 681 struct sctp_bind_addr *bp = &ep->base.bind_addr;
684 int retval = 0; 682 int retval = 0;
685 void *addr_buf; 683 void *addr_buf;
686 union sctp_addr *sa_addr; 684 union sctp_addr *sa_addr;
687 struct sctp_af *af; 685 struct sctp_af *af;
688 686
689 pr_debug("%s: sk:%p, addrs:%p, addrcnt 687 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
690 __func__, sk, addrs, addrcnt) 688 __func__, sk, addrs, addrcnt);
691 689
692 addr_buf = addrs; 690 addr_buf = addrs;
693 for (cnt = 0; cnt < addrcnt; cnt++) { 691 for (cnt = 0; cnt < addrcnt; cnt++) {
694 /* If the bind address list is 692 /* If the bind address list is empty or if there is only one
695 * bind address, there is noth 693 * bind address, there is nothing more to be removed (we need
696 * at least one address here). 694 * at least one address here).
697 */ 695 */
698 if (list_empty(&bp->address_li 696 if (list_empty(&bp->address_list) ||
699 (sctp_list_single_entry(&b 697 (sctp_list_single_entry(&bp->address_list))) {
700 retval = -EBUSY; 698 retval = -EBUSY;
701 goto err_bindx_rem; 699 goto err_bindx_rem;
702 } 700 }
703 701
704 sa_addr = addr_buf; 702 sa_addr = addr_buf;
705 af = sctp_get_af_specific(sa_a 703 af = sctp_get_af_specific(sa_addr->sa.sa_family);
706 if (!af) { 704 if (!af) {
707 retval = -EINVAL; 705 retval = -EINVAL;
708 goto err_bindx_rem; 706 goto err_bindx_rem;
709 } 707 }
710 708
711 if (!af->addr_valid(sa_addr, s 709 if (!af->addr_valid(sa_addr, sp, NULL)) {
712 retval = -EADDRNOTAVAI 710 retval = -EADDRNOTAVAIL;
713 goto err_bindx_rem; 711 goto err_bindx_rem;
714 } 712 }
715 713
716 if (sa_addr->v4.sin_port && 714 if (sa_addr->v4.sin_port &&
717 sa_addr->v4.sin_port != ht 715 sa_addr->v4.sin_port != htons(bp->port)) {
718 retval = -EINVAL; 716 retval = -EINVAL;
719 goto err_bindx_rem; 717 goto err_bindx_rem;
720 } 718 }
721 719
722 if (!sa_addr->v4.sin_port) 720 if (!sa_addr->v4.sin_port)
723 sa_addr->v4.sin_port = 721 sa_addr->v4.sin_port = htons(bp->port);
724 722
725 /* FIXME - There is probably a 723 /* FIXME - There is probably a need to check if sk->sk_saddr and
726 * sk->sk_rcv_addr are current 724 * sk->sk_rcv_addr are currently set to one of the addresses to
727 * be removed. This is somethi 725 * be removed. This is something which needs to be looked into
728 * when we are fixing the outs 726 * when we are fixing the outstanding issues with multi-homing
729 * socket routing and failover 727 * socket routing and failover schemes. Refer to comments in
730 * sctp_do_bind(). -daisy 728 * sctp_do_bind(). -daisy
731 */ 729 */
732 retval = sctp_del_bind_addr(bp 730 retval = sctp_del_bind_addr(bp, sa_addr);
733 731
734 addr_buf += af->sockaddr_len; 732 addr_buf += af->sockaddr_len;
735 err_bindx_rem: 733 err_bindx_rem:
736 if (retval < 0) { 734 if (retval < 0) {
737 /* Failed. Add the one 735 /* Failed. Add the ones that has been removed back */
738 if (cnt > 0) 736 if (cnt > 0)
739 sctp_bindx_add 737 sctp_bindx_add(sk, addrs, cnt);
740 return retval; 738 return retval;
741 } 739 }
742 } 740 }
743 741
744 return retval; 742 return retval;
745 } 743 }
746 744
747 /* Send an ASCONF chunk with Delete IP address 745 /* Send an ASCONF chunk with Delete IP address parameters to all the peers of
748 * the associations that are part of the endpo 746 * the associations that are part of the endpoint indicating that a list of
749 * local addresses are removed from the endpoi 747 * local addresses are removed from the endpoint.
750 * 748 *
751 * If any of the addresses is already in the b 749 * If any of the addresses is already in the bind address list of the
752 * association, we do not send the chunk for t 750 * association, we do not send the chunk for that association. But it will not
753 * affect other associations. 751 * affect other associations.
754 * 752 *
755 * Only sctp_setsockopt_bindx() is supposed to 753 * Only sctp_setsockopt_bindx() is supposed to call this function.
756 */ 754 */
757 static int sctp_send_asconf_del_ip(struct sock 755 static int sctp_send_asconf_del_ip(struct sock *sk,
758 struct sock 756 struct sockaddr *addrs,
759 int 757 int addrcnt)
760 { 758 {
761 struct sctp_sock *sp; 759 struct sctp_sock *sp;
762 struct sctp_endpoint *ep; 760 struct sctp_endpoint *ep;
763 struct sctp_association *asoc; 761 struct sctp_association *asoc;
764 struct sctp_transport *transport; 762 struct sctp_transport *transport;
765 struct sctp_bind_addr *bp; 763 struct sctp_bind_addr *bp;
766 struct sctp_chunk *chunk; 764 struct sctp_chunk *chunk;
767 union sctp_addr *laddr; 765 union sctp_addr *laddr;
768 void *addr_buf; 766 void *addr_buf;
769 struct sctp_af *af; 767 struct sctp_af *af;
770 struct sctp_sockaddr_entry *saddr; 768 struct sctp_sockaddr_entry *saddr;
771 int i; 769 int i;
772 int retval = 0; 770 int retval = 0;
773 int stored = 0; 771 int stored = 0;
774 772
775 chunk = NULL; 773 chunk = NULL;
776 sp = sctp_sk(sk); 774 sp = sctp_sk(sk);
777 ep = sp->ep; 775 ep = sp->ep;
778 776
779 if (!ep->asconf_enable) 777 if (!ep->asconf_enable)
780 return retval; 778 return retval;
781 779
782 pr_debug("%s: sk:%p, addrs:%p, addrcnt 780 pr_debug("%s: sk:%p, addrs:%p, addrcnt:%d\n",
783 __func__, sk, addrs, addrcnt) 781 __func__, sk, addrs, addrcnt);
784 782
785 list_for_each_entry(asoc, &ep->asocs, 783 list_for_each_entry(asoc, &ep->asocs, asocs) {
786 784
787 if (!asoc->peer.asconf_capable 785 if (!asoc->peer.asconf_capable)
788 continue; 786 continue;
789 787
790 if (asoc->peer.addip_disabled_ 788 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_DEL_IP)
791 continue; 789 continue;
792 790
793 if (!sctp_state(asoc, ESTABLIS 791 if (!sctp_state(asoc, ESTABLISHED))
794 continue; 792 continue;
795 793
796 /* Check if any address in the 794 /* Check if any address in the packed array of addresses is
797 * not present in the bind add 795 * not present in the bind address list of the association.
798 * If so, do not send the asco 796 * If so, do not send the asconf chunk to its peer, but
799 * continue with other associa 797 * continue with other associations.
800 */ 798 */
801 addr_buf = addrs; 799 addr_buf = addrs;
802 for (i = 0; i < addrcnt; i++) 800 for (i = 0; i < addrcnt; i++) {
803 laddr = addr_buf; 801 laddr = addr_buf;
804 af = sctp_get_af_speci 802 af = sctp_get_af_specific(laddr->v4.sin_family);
805 if (!af) { 803 if (!af) {
806 retval = -EINV 804 retval = -EINVAL;
807 goto out; 805 goto out;
808 } 806 }
809 807
810 if (!sctp_assoc_lookup 808 if (!sctp_assoc_lookup_laddr(asoc, laddr))
811 break; 809 break;
812 810
813 addr_buf += af->sockad 811 addr_buf += af->sockaddr_len;
814 } 812 }
815 if (i < addrcnt) 813 if (i < addrcnt)
816 continue; 814 continue;
817 815
818 /* Find one address in the ass 816 /* Find one address in the association's bind address list
819 * that is not in the packed a 817 * that is not in the packed array of addresses. This is to
820 * make sure that we do not de 818 * make sure that we do not delete all the addresses in the
821 * association. 819 * association.
822 */ 820 */
823 bp = &asoc->base.bind_addr; 821 bp = &asoc->base.bind_addr;
824 laddr = sctp_find_unmatch_addr 822 laddr = sctp_find_unmatch_addr(bp, (union sctp_addr *)addrs,
825 823 addrcnt, sp);
826 if ((laddr == NULL) && (addrcn 824 if ((laddr == NULL) && (addrcnt == 1)) {
827 if (asoc->asconf_addr_ 825 if (asoc->asconf_addr_del_pending)
828 continue; 826 continue;
829 asoc->asconf_addr_del_ 827 asoc->asconf_addr_del_pending =
830 kzalloc(sizeof(uni 828 kzalloc(sizeof(union sctp_addr), GFP_ATOMIC);
831 if (asoc->asconf_addr_ 829 if (asoc->asconf_addr_del_pending == NULL) {
832 retval = -ENOM 830 retval = -ENOMEM;
833 goto out; 831 goto out;
834 } 832 }
835 asoc->asconf_addr_del_ 833 asoc->asconf_addr_del_pending->sa.sa_family =
836 addrs->sa_ 834 addrs->sa_family;
837 asoc->asconf_addr_del_ 835 asoc->asconf_addr_del_pending->v4.sin_port =
838 htons(bp-> 836 htons(bp->port);
839 if (addrs->sa_family = 837 if (addrs->sa_family == AF_INET) {
840 struct sockadd 838 struct sockaddr_in *sin;
841 839
842 sin = (struct 840 sin = (struct sockaddr_in *)addrs;
843 asoc->asconf_a 841 asoc->asconf_addr_del_pending->v4.sin_addr.s_addr = sin->sin_addr.s_addr;
844 } else if (addrs->sa_f 842 } else if (addrs->sa_family == AF_INET6) {
845 struct sockadd 843 struct sockaddr_in6 *sin6;
846 844
847 sin6 = (struct 845 sin6 = (struct sockaddr_in6 *)addrs;
848 asoc->asconf_a 846 asoc->asconf_addr_del_pending->v6.sin6_addr = sin6->sin6_addr;
849 } 847 }
850 848
851 pr_debug("%s: keep the 849 pr_debug("%s: keep the last address asoc:%p %pISc at %p\n",
852 __func__, aso 850 __func__, asoc, &asoc->asconf_addr_del_pending->sa,
853 asoc->asconf_ 851 asoc->asconf_addr_del_pending);
854 852
855 asoc->src_out_of_asoc_ 853 asoc->src_out_of_asoc_ok = 1;
856 stored = 1; 854 stored = 1;
857 goto skip_mkasconf; 855 goto skip_mkasconf;
858 } 856 }
859 857
860 if (laddr == NULL) 858 if (laddr == NULL)
861 return -EINVAL; 859 return -EINVAL;
862 860
863 /* We do not need RCU protecti 861 /* We do not need RCU protection throughout this loop
864 * because this is done under 862 * because this is done under a socket lock from the
865 * setsockopt call. 863 * setsockopt call.
866 */ 864 */
867 chunk = sctp_make_asconf_updat 865 chunk = sctp_make_asconf_update_ip(asoc, laddr, addrs, addrcnt,
868 866 SCTP_PARAM_DEL_IP);
869 if (!chunk) { 867 if (!chunk) {
870 retval = -ENOMEM; 868 retval = -ENOMEM;
871 goto out; 869 goto out;
872 } 870 }
873 871
874 skip_mkasconf: 872 skip_mkasconf:
875 /* Reset use_as_src flag for t 873 /* Reset use_as_src flag for the addresses in the bind address
876 * list that are to be deleted 874 * list that are to be deleted.
877 */ 875 */
878 addr_buf = addrs; 876 addr_buf = addrs;
879 for (i = 0; i < addrcnt; i++) 877 for (i = 0; i < addrcnt; i++) {
880 laddr = addr_buf; 878 laddr = addr_buf;
881 af = sctp_get_af_speci 879 af = sctp_get_af_specific(laddr->v4.sin_family);
882 list_for_each_entry(sa 880 list_for_each_entry(saddr, &bp->address_list, list) {
883 if (sctp_cmp_a 881 if (sctp_cmp_addr_exact(&saddr->a, laddr))
884 saddr- 882 saddr->state = SCTP_ADDR_DEL;
885 } 883 }
886 addr_buf += af->sockad 884 addr_buf += af->sockaddr_len;
887 } 885 }
888 886
889 /* Update the route and saddr 887 /* Update the route and saddr entries for all the transports
890 * as some of the addresses in 888 * as some of the addresses in the bind address list are
891 * about to be deleted and can 889 * about to be deleted and cannot be used as source addresses.
892 */ 890 */
893 list_for_each_entry(transport, 891 list_for_each_entry(transport, &asoc->peer.transport_addr_list,
894 transp 892 transports) {
895 sctp_transport_route(t 893 sctp_transport_route(transport, NULL,
896 s 894 sctp_sk(asoc->base.sk));
897 } 895 }
898 896
899 if (stored) 897 if (stored)
900 /* We don't need to tr 898 /* We don't need to transmit ASCONF */
901 continue; 899 continue;
902 retval = sctp_send_asconf(asoc 900 retval = sctp_send_asconf(asoc, chunk);
903 } 901 }
904 out: 902 out:
905 return retval; 903 return retval;
906 } 904 }
907 905
908 /* set addr events to assocs in the endpoint. 906 /* 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 907 int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw)
910 { 908 {
911 struct sock *sk = sctp_opt2sk(sp); 909 struct sock *sk = sctp_opt2sk(sp);
912 union sctp_addr *addr; 910 union sctp_addr *addr;
913 struct sctp_af *af; 911 struct sctp_af *af;
914 912
915 /* It is safe to write port space in c 913 /* It is safe to write port space in caller. */
916 addr = &addrw->a; 914 addr = &addrw->a;
917 addr->v4.sin_port = htons(sp->ep->base 915 addr->v4.sin_port = htons(sp->ep->base.bind_addr.port);
918 af = sctp_get_af_specific(addr->sa.sa_ 916 af = sctp_get_af_specific(addr->sa.sa_family);
919 if (!af) 917 if (!af)
920 return -EINVAL; 918 return -EINVAL;
921 if (sctp_verify_addr(sk, addr, af->soc 919 if (sctp_verify_addr(sk, addr, af->sockaddr_len))
922 return -EINVAL; 920 return -EINVAL;
923 921
924 if (addrw->state == SCTP_ADDR_NEW) 922 if (addrw->state == SCTP_ADDR_NEW)
925 return sctp_send_asconf_add_ip 923 return sctp_send_asconf_add_ip(sk, (struct sockaddr *)addr, 1);
926 else 924 else
927 return sctp_send_asconf_del_ip 925 return sctp_send_asconf_del_ip(sk, (struct sockaddr *)addr, 1);
928 } 926 }
929 927
930 /* Helper for tunneling sctp_bindx() requests 928 /* Helper for tunneling sctp_bindx() requests through sctp_setsockopt()
931 * 929 *
932 * API 8.1 930 * API 8.1
933 * int sctp_bindx(int sd, struct sockaddr *add 931 * int sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt,
934 * int flags); 932 * int flags);
935 * 933 *
936 * If sd is an IPv4 socket, the addresses pass 934 * If sd is an IPv4 socket, the addresses passed must be IPv4 addresses.
937 * If the sd is an IPv6 socket, the addresses 935 * If the sd is an IPv6 socket, the addresses passed can either be IPv4
938 * or IPv6 addresses. 936 * or IPv6 addresses.
939 * 937 *
940 * A single address may be specified as INADDR 938 * A single address may be specified as INADDR_ANY or IN6ADDR_ANY, see
941 * Section 3.1.2 for this usage. 939 * Section 3.1.2 for this usage.
942 * 940 *
943 * addrs is a pointer to an array of one or mo 941 * addrs is a pointer to an array of one or more socket addresses. Each
944 * address is contained in its appropriate str 942 * address is contained in its appropriate structure (i.e. struct
945 * sockaddr_in or struct sockaddr_in6) the fam 943 * sockaddr_in or struct sockaddr_in6) the family of the address type
946 * must be used to distinguish the address len 944 * must be used to distinguish the address length (note that this
947 * representation is termed a "packed array" o 945 * representation is termed a "packed array" of addresses). The caller
948 * specifies the number of addresses in the ar 946 * specifies the number of addresses in the array with addrcnt.
949 * 947 *
950 * On success, sctp_bindx() returns 0. On fail 948 * On success, sctp_bindx() returns 0. On failure, sctp_bindx() returns
951 * -1, and sets errno to the appropriate error 949 * -1, and sets errno to the appropriate error code.
952 * 950 *
953 * For SCTP, the port given in each socket add 951 * For SCTP, the port given in each socket address must be the same, or
954 * sctp_bindx() will fail, setting errno to EI 952 * sctp_bindx() will fail, setting errno to EINVAL.
955 * 953 *
956 * The flags parameter is formed from the bitw 954 * The flags parameter is formed from the bitwise OR of zero or more of
957 * the following currently defined flags: 955 * the following currently defined flags:
958 * 956 *
959 * SCTP_BINDX_ADD_ADDR 957 * SCTP_BINDX_ADD_ADDR
960 * 958 *
961 * SCTP_BINDX_REM_ADDR 959 * SCTP_BINDX_REM_ADDR
962 * 960 *
963 * SCTP_BINDX_ADD_ADDR directs SCTP to add the 961 * SCTP_BINDX_ADD_ADDR directs SCTP to add the given addresses to the
964 * association, and SCTP_BINDX_REM_ADDR direct 962 * association, and SCTP_BINDX_REM_ADDR directs SCTP to remove the given
965 * addresses from the association. The two fla 963 * addresses from the association. The two flags are mutually exclusive;
966 * if both are given, sctp_bindx() will fail w 964 * if both are given, sctp_bindx() will fail with EINVAL. A caller may
967 * not remove all addresses from an associatio 965 * not remove all addresses from an association; sctp_bindx() will
968 * reject such an attempt with EINVAL. 966 * reject such an attempt with EINVAL.
969 * 967 *
970 * An application can use sctp_bindx(SCTP_BIND 968 * An application can use sctp_bindx(SCTP_BINDX_ADD_ADDR) to associate
971 * additional addresses with an endpoint after 969 * additional addresses with an endpoint after calling bind(). Or use
972 * sctp_bindx(SCTP_BINDX_REM_ADDR) to remove s 970 * sctp_bindx(SCTP_BINDX_REM_ADDR) to remove some addresses a listening
973 * socket is associated with so that no new as 971 * socket is associated with so that no new association accepted will be
974 * associated with those addresses. If the end 972 * associated with those addresses. If the endpoint supports dynamic
975 * address a SCTP_BINDX_REM_ADDR or SCTP_BINDX 973 * address a SCTP_BINDX_REM_ADDR or SCTP_BINDX_ADD_ADDR may cause a
976 * endpoint to send the appropriate message to 974 * endpoint to send the appropriate message to the peer to change the
977 * peers address lists. 975 * peers address lists.
978 * 976 *
979 * Adding and removing addresses from a connec 977 * Adding and removing addresses from a connected association is
980 * optional functionality. Implementations tha 978 * optional functionality. Implementations that do not support this
981 * functionality should return EOPNOTSUPP. 979 * functionality should return EOPNOTSUPP.
982 * 980 *
983 * Basically do nothing but copying the addres 981 * Basically do nothing but copying the addresses from user to kernel
984 * land and invoking either sctp_bindx_add() o 982 * land and invoking either sctp_bindx_add() or sctp_bindx_rem() on the sk.
985 * This is used for tunneling the sctp_bindx() 983 * This is used for tunneling the sctp_bindx() request through sctp_setsockopt()
986 * from userspace. 984 * from userspace.
987 * 985 *
988 * On exit there is no need to do sockfd_put() 986 * On exit there is no need to do sockfd_put(), sys_setsockopt() does
989 * it. 987 * it.
990 * 988 *
991 * sk The sk of the socket 989 * sk The sk of the socket
992 * addrs The pointer to the addresses !! 990 * addrs The pointer to the addresses in user land
993 * addrssize Size of the addrs buffer 991 * addrssize Size of the addrs buffer
994 * op Operation to perform (add or remo 992 * op Operation to perform (add or remove, see the flags of
995 * sctp_bindx) 993 * sctp_bindx)
996 * 994 *
997 * Returns 0 if ok, <0 errno code on error. 995 * Returns 0 if ok, <0 errno code on error.
998 */ 996 */
999 static int sctp_setsockopt_bindx(struct sock * !! 997 static int sctp_setsockopt_bindx(struct sock *sk,
>> 998 struct sockaddr __user *addrs,
1000 int addrs_si 999 int addrs_size, int op)
1001 { 1000 {
>> 1001 struct sockaddr *kaddrs;
1002 int err; 1002 int err;
1003 int addrcnt = 0; 1003 int addrcnt = 0;
1004 int walk_size = 0; 1004 int walk_size = 0;
1005 struct sockaddr *sa_addr; 1005 struct sockaddr *sa_addr;
1006 void *addr_buf = addrs; !! 1006 void *addr_buf;
1007 struct sctp_af *af; 1007 struct sctp_af *af;
1008 1008
1009 pr_debug("%s: sk:%p addrs:%p addrs_si 1009 pr_debug("%s: sk:%p addrs:%p addrs_size:%d opt:%d\n",
1010 __func__, sk, addr_buf, addr !! 1010 __func__, sk, addrs, addrs_size, op);
1011 1011
1012 if (unlikely(addrs_size <= 0)) 1012 if (unlikely(addrs_size <= 0))
1013 return -EINVAL; 1013 return -EINVAL;
1014 1014
>> 1015 kaddrs = memdup_user(addrs, addrs_size);
>> 1016 if (IS_ERR(kaddrs))
>> 1017 return PTR_ERR(kaddrs);
>> 1018
1015 /* Walk through the addrs buffer and 1019 /* Walk through the addrs buffer and count the number of addresses. */
>> 1020 addr_buf = kaddrs;
1016 while (walk_size < addrs_size) { 1021 while (walk_size < addrs_size) {
1017 if (walk_size + sizeof(sa_fam !! 1022 if (walk_size + sizeof(sa_family_t) > addrs_size) {
>> 1023 kfree(kaddrs);
1018 return -EINVAL; 1024 return -EINVAL;
>> 1025 }
1019 1026
1020 sa_addr = addr_buf; 1027 sa_addr = addr_buf;
1021 af = sctp_get_af_specific(sa_ 1028 af = sctp_get_af_specific(sa_addr->sa_family);
1022 1029
1023 /* If the address family is n 1030 /* If the address family is not supported or if this address
1024 * causes the address buffer 1031 * causes the address buffer to overflow return EINVAL.
1025 */ 1032 */
1026 if (!af || (walk_size + af->s !! 1033 if (!af || (walk_size + af->sockaddr_len) > addrs_size) {
>> 1034 kfree(kaddrs);
1027 return -EINVAL; 1035 return -EINVAL;
>> 1036 }
1028 addrcnt++; 1037 addrcnt++;
1029 addr_buf += af->sockaddr_len; 1038 addr_buf += af->sockaddr_len;
1030 walk_size += af->sockaddr_len 1039 walk_size += af->sockaddr_len;
1031 } 1040 }
1032 1041
1033 /* Do the work. */ 1042 /* Do the work. */
1034 switch (op) { 1043 switch (op) {
1035 case SCTP_BINDX_ADD_ADDR: 1044 case SCTP_BINDX_ADD_ADDR:
1036 /* Allow security module to v 1045 /* Allow security module to validate bindx addresses. */
1037 err = security_sctp_bind_conn 1046 err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_BINDX_ADD,
1038 !! 1047 (struct sockaddr *)kaddrs,
>> 1048 addrs_size);
1039 if (err) 1049 if (err)
1040 return err; !! 1050 goto out;
1041 err = sctp_bindx_add(sk, addr !! 1051 err = sctp_bindx_add(sk, kaddrs, addrcnt);
1042 if (err) 1052 if (err)
1043 return err; !! 1053 goto out;
1044 return sctp_send_asconf_add_i !! 1054 err = sctp_send_asconf_add_ip(sk, kaddrs, addrcnt);
>> 1055 break;
>> 1056
1045 case SCTP_BINDX_REM_ADDR: 1057 case SCTP_BINDX_REM_ADDR:
1046 err = sctp_bindx_rem(sk, addr !! 1058 err = sctp_bindx_rem(sk, kaddrs, addrcnt);
1047 if (err) 1059 if (err)
1048 return err; !! 1060 goto out;
1049 return sctp_send_asconf_del_i !! 1061 err = sctp_send_asconf_del_ip(sk, kaddrs, addrcnt);
>> 1062 break;
1050 1063
1051 default: 1064 default:
1052 return -EINVAL; !! 1065 err = -EINVAL;
>> 1066 break;
1053 } 1067 }
1054 } <<
1055 1068
1056 static int sctp_bind_add(struct sock *sk, str !! 1069 out:
1057 int addrlen) !! 1070 kfree(kaddrs);
1058 { <<
1059 int err; <<
1060 1071
1061 lock_sock(sk); <<
1062 err = sctp_setsockopt_bindx(sk, addrs <<
1063 release_sock(sk); <<
1064 return err; 1072 return err;
1065 } 1073 }
1066 1074
1067 static int sctp_connect_new_asoc(struct sctp_ 1075 static int sctp_connect_new_asoc(struct sctp_endpoint *ep,
1068 const union 1076 const union sctp_addr *daddr,
1069 const struct 1077 const struct sctp_initmsg *init,
1070 struct sctp_ 1078 struct sctp_transport **tp)
1071 { 1079 {
1072 struct sctp_association *asoc; 1080 struct sctp_association *asoc;
1073 struct sock *sk = ep->base.sk; 1081 struct sock *sk = ep->base.sk;
1074 struct net *net = sock_net(sk); 1082 struct net *net = sock_net(sk);
1075 enum sctp_scope scope; 1083 enum sctp_scope scope;
1076 int err; 1084 int err;
1077 1085
1078 if (sctp_endpoint_is_peeled_off(ep, d 1086 if (sctp_endpoint_is_peeled_off(ep, daddr))
1079 return -EADDRNOTAVAIL; 1087 return -EADDRNOTAVAIL;
1080 1088
1081 if (!ep->base.bind_addr.port) { 1089 if (!ep->base.bind_addr.port) {
1082 if (sctp_autobind(sk)) 1090 if (sctp_autobind(sk))
1083 return -EAGAIN; 1091 return -EAGAIN;
1084 } else { 1092 } else {
1085 if (inet_port_requires_bind_s !! 1093 if (ep->base.bind_addr.port < inet_prot_sock(net) &&
1086 !ns_capable(net->user_ns, 1094 !ns_capable(net->user_ns, CAP_NET_BIND_SERVICE))
1087 return -EACCES; 1095 return -EACCES;
1088 } 1096 }
1089 1097
1090 scope = sctp_scope(daddr); 1098 scope = sctp_scope(daddr);
1091 asoc = sctp_association_new(ep, sk, s 1099 asoc = sctp_association_new(ep, sk, scope, GFP_KERNEL);
1092 if (!asoc) 1100 if (!asoc)
1093 return -ENOMEM; 1101 return -ENOMEM;
1094 1102
1095 err = sctp_assoc_set_bind_addr_from_e 1103 err = sctp_assoc_set_bind_addr_from_ep(asoc, scope, GFP_KERNEL);
1096 if (err < 0) 1104 if (err < 0)
1097 goto free; 1105 goto free;
1098 1106
1099 *tp = sctp_assoc_add_peer(asoc, daddr 1107 *tp = sctp_assoc_add_peer(asoc, daddr, GFP_KERNEL, SCTP_UNKNOWN);
1100 if (!*tp) { 1108 if (!*tp) {
1101 err = -ENOMEM; 1109 err = -ENOMEM;
1102 goto free; 1110 goto free;
1103 } 1111 }
1104 1112
1105 if (!init) 1113 if (!init)
1106 return 0; 1114 return 0;
1107 1115
1108 if (init->sinit_num_ostreams) { 1116 if (init->sinit_num_ostreams) {
1109 __u16 outcnt = init->sinit_nu 1117 __u16 outcnt = init->sinit_num_ostreams;
1110 1118
1111 asoc->c.sinit_num_ostreams = 1119 asoc->c.sinit_num_ostreams = outcnt;
1112 /* outcnt has been changed, n 1120 /* outcnt has been changed, need to re-init stream */
1113 err = sctp_stream_init(&asoc- 1121 err = sctp_stream_init(&asoc->stream, outcnt, 0, GFP_KERNEL);
1114 if (err) 1122 if (err)
1115 goto free; 1123 goto free;
1116 } 1124 }
1117 1125
1118 if (init->sinit_max_instreams) 1126 if (init->sinit_max_instreams)
1119 asoc->c.sinit_max_instreams = 1127 asoc->c.sinit_max_instreams = init->sinit_max_instreams;
1120 1128
1121 if (init->sinit_max_attempts) 1129 if (init->sinit_max_attempts)
1122 asoc->max_init_attempts = ini 1130 asoc->max_init_attempts = init->sinit_max_attempts;
1123 1131
1124 if (init->sinit_max_init_timeo) 1132 if (init->sinit_max_init_timeo)
1125 asoc->max_init_timeo = 1133 asoc->max_init_timeo =
1126 msecs_to_jiffies(init 1134 msecs_to_jiffies(init->sinit_max_init_timeo);
1127 1135
1128 return 0; 1136 return 0;
1129 free: 1137 free:
1130 sctp_association_free(asoc); 1138 sctp_association_free(asoc);
1131 return err; 1139 return err;
1132 } 1140 }
1133 1141
1134 static int sctp_connect_add_peer(struct sctp_ 1142 static int sctp_connect_add_peer(struct sctp_association *asoc,
1135 union sctp_a 1143 union sctp_addr *daddr, int addr_len)
1136 { 1144 {
1137 struct sctp_endpoint *ep = asoc->ep; 1145 struct sctp_endpoint *ep = asoc->ep;
1138 struct sctp_association *old; 1146 struct sctp_association *old;
1139 struct sctp_transport *t; 1147 struct sctp_transport *t;
1140 int err; 1148 int err;
1141 1149
1142 err = sctp_verify_addr(ep->base.sk, d 1150 err = sctp_verify_addr(ep->base.sk, daddr, addr_len);
1143 if (err) 1151 if (err)
1144 return err; 1152 return err;
1145 1153
1146 old = sctp_endpoint_lookup_assoc(ep, 1154 old = sctp_endpoint_lookup_assoc(ep, daddr, &t);
1147 if (old && old != asoc) 1155 if (old && old != asoc)
1148 return old->state >= SCTP_STA 1156 return old->state >= SCTP_STATE_ESTABLISHED ? -EISCONN
1149 1157 : -EALREADY;
1150 1158
1151 if (sctp_endpoint_is_peeled_off(ep, d 1159 if (sctp_endpoint_is_peeled_off(ep, daddr))
1152 return -EADDRNOTAVAIL; 1160 return -EADDRNOTAVAIL;
1153 1161
1154 t = sctp_assoc_add_peer(asoc, daddr, 1162 t = sctp_assoc_add_peer(asoc, daddr, GFP_KERNEL, SCTP_UNKNOWN);
1155 if (!t) 1163 if (!t)
1156 return -ENOMEM; 1164 return -ENOMEM;
1157 1165
1158 return 0; 1166 return 0;
1159 } 1167 }
1160 1168
1161 /* __sctp_connect(struct sock* sk, struct soc 1169 /* __sctp_connect(struct sock* sk, struct sockaddr *kaddrs, int addrs_size)
1162 * 1170 *
1163 * Common routine for handling connect() and 1171 * Common routine for handling connect() and sctp_connectx().
1164 * Connect will come in with just a single ad 1172 * Connect will come in with just a single address.
1165 */ 1173 */
1166 static int __sctp_connect(struct sock *sk, st 1174 static int __sctp_connect(struct sock *sk, struct sockaddr *kaddrs,
1167 int addrs_size, int 1175 int addrs_size, int flags, sctp_assoc_t *assoc_id)
1168 { 1176 {
1169 struct sctp_sock *sp = sctp_sk(sk); 1177 struct sctp_sock *sp = sctp_sk(sk);
1170 struct sctp_endpoint *ep = sp->ep; 1178 struct sctp_endpoint *ep = sp->ep;
1171 struct sctp_transport *transport; 1179 struct sctp_transport *transport;
1172 struct sctp_association *asoc; 1180 struct sctp_association *asoc;
1173 void *addr_buf = kaddrs; 1181 void *addr_buf = kaddrs;
1174 union sctp_addr *daddr; 1182 union sctp_addr *daddr;
1175 struct sctp_af *af; 1183 struct sctp_af *af;
1176 int walk_size, err; 1184 int walk_size, err;
1177 long timeo; 1185 long timeo;
1178 1186
1179 if (sctp_sstate(sk, ESTABLISHED) || s 1187 if (sctp_sstate(sk, ESTABLISHED) || sctp_sstate(sk, CLOSING) ||
1180 (sctp_style(sk, TCP) && sctp_ssta 1188 (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING)))
1181 return -EISCONN; 1189 return -EISCONN;
1182 1190
1183 daddr = addr_buf; 1191 daddr = addr_buf;
1184 af = sctp_get_af_specific(daddr->sa.s 1192 af = sctp_get_af_specific(daddr->sa.sa_family);
1185 if (!af || af->sockaddr_len > addrs_s 1193 if (!af || af->sockaddr_len > addrs_size)
1186 return -EINVAL; 1194 return -EINVAL;
1187 1195
1188 err = sctp_verify_addr(sk, daddr, af- 1196 err = sctp_verify_addr(sk, daddr, af->sockaddr_len);
1189 if (err) 1197 if (err)
1190 return err; 1198 return err;
1191 1199
1192 asoc = sctp_endpoint_lookup_assoc(ep, 1200 asoc = sctp_endpoint_lookup_assoc(ep, daddr, &transport);
1193 if (asoc) 1201 if (asoc)
1194 return asoc->state >= SCTP_ST 1202 return asoc->state >= SCTP_STATE_ESTABLISHED ? -EISCONN
1195 1203 : -EALREADY;
1196 1204
1197 err = sctp_connect_new_asoc(ep, daddr 1205 err = sctp_connect_new_asoc(ep, daddr, NULL, &transport);
1198 if (err) 1206 if (err)
1199 return err; 1207 return err;
1200 asoc = transport->asoc; 1208 asoc = transport->asoc;
1201 1209
1202 addr_buf += af->sockaddr_len; 1210 addr_buf += af->sockaddr_len;
1203 walk_size = af->sockaddr_len; 1211 walk_size = af->sockaddr_len;
1204 while (walk_size < addrs_size) { 1212 while (walk_size < addrs_size) {
1205 err = -EINVAL; 1213 err = -EINVAL;
1206 if (walk_size + sizeof(sa_fam 1214 if (walk_size + sizeof(sa_family_t) > addrs_size)
1207 goto out_free; 1215 goto out_free;
1208 1216
1209 daddr = addr_buf; 1217 daddr = addr_buf;
1210 af = sctp_get_af_specific(dad 1218 af = sctp_get_af_specific(daddr->sa.sa_family);
1211 if (!af || af->sockaddr_len + 1219 if (!af || af->sockaddr_len + walk_size > addrs_size)
1212 goto out_free; 1220 goto out_free;
1213 1221
1214 if (asoc->peer.port != ntohs( 1222 if (asoc->peer.port != ntohs(daddr->v4.sin_port))
1215 goto out_free; 1223 goto out_free;
1216 1224
1217 err = sctp_connect_add_peer(a 1225 err = sctp_connect_add_peer(asoc, daddr, af->sockaddr_len);
1218 if (err) 1226 if (err)
1219 goto out_free; 1227 goto out_free;
1220 1228
1221 addr_buf += af->sockaddr_len 1229 addr_buf += af->sockaddr_len;
1222 walk_size += af->sockaddr_len 1230 walk_size += af->sockaddr_len;
1223 } 1231 }
1224 1232
1225 /* In case the user of sctp_connectx( 1233 /* In case the user of sctp_connectx() wants an association
1226 * id back, assign one now. 1234 * id back, assign one now.
1227 */ 1235 */
1228 if (assoc_id) { 1236 if (assoc_id) {
1229 err = sctp_assoc_set_id(asoc, 1237 err = sctp_assoc_set_id(asoc, GFP_KERNEL);
1230 if (err < 0) 1238 if (err < 0)
1231 goto out_free; 1239 goto out_free;
1232 } 1240 }
1233 1241
1234 err = sctp_primitive_ASSOCIATE(sock_n 1242 err = sctp_primitive_ASSOCIATE(sock_net(sk), asoc, NULL);
1235 if (err < 0) 1243 if (err < 0)
1236 goto out_free; 1244 goto out_free;
1237 1245
1238 /* Initialize sk's dport and daddr fo 1246 /* Initialize sk's dport and daddr for getpeername() */
1239 inet_sk(sk)->inet_dport = htons(asoc- 1247 inet_sk(sk)->inet_dport = htons(asoc->peer.port);
1240 sp->pf->to_sk_daddr(daddr, sk); 1248 sp->pf->to_sk_daddr(daddr, sk);
1241 sk->sk_err = 0; 1249 sk->sk_err = 0;
1242 1250
1243 if (assoc_id) 1251 if (assoc_id)
1244 *assoc_id = asoc->assoc_id; 1252 *assoc_id = asoc->assoc_id;
1245 1253
1246 timeo = sock_sndtimeo(sk, flags & O_N 1254 timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
1247 return sctp_wait_for_connect(asoc, &t 1255 return sctp_wait_for_connect(asoc, &timeo);
1248 1256
1249 out_free: 1257 out_free:
1250 pr_debug("%s: took out_free path with 1258 pr_debug("%s: took out_free path with asoc:%p kaddrs:%p err:%d\n",
1251 __func__, asoc, kaddrs, err) 1259 __func__, asoc, kaddrs, err);
1252 sctp_association_free(asoc); 1260 sctp_association_free(asoc);
1253 return err; 1261 return err;
1254 } 1262 }
1255 1263
1256 /* Helper for tunneling sctp_connectx() reque 1264 /* Helper for tunneling sctp_connectx() requests through sctp_setsockopt()
1257 * 1265 *
1258 * API 8.9 1266 * API 8.9
1259 * int sctp_connectx(int sd, struct sockaddr 1267 * int sctp_connectx(int sd, struct sockaddr *addrs, int addrcnt,
1260 * sctp_assoc_t *asoc); 1268 * sctp_assoc_t *asoc);
1261 * 1269 *
1262 * If sd is an IPv4 socket, the addresses pas 1270 * If sd is an IPv4 socket, the addresses passed must be IPv4 addresses.
1263 * If the sd is an IPv6 socket, the addresses 1271 * If the sd is an IPv6 socket, the addresses passed can either be IPv4
1264 * or IPv6 addresses. 1272 * or IPv6 addresses.
1265 * 1273 *
1266 * A single address may be specified as INADD 1274 * A single address may be specified as INADDR_ANY or IN6ADDR_ANY, see
1267 * Section 3.1.2 for this usage. 1275 * Section 3.1.2 for this usage.
1268 * 1276 *
1269 * addrs is a pointer to an array of one or m 1277 * addrs is a pointer to an array of one or more socket addresses. Each
1270 * address is contained in its appropriate st 1278 * address is contained in its appropriate structure (i.e. struct
1271 * sockaddr_in or struct sockaddr_in6) the fa 1279 * sockaddr_in or struct sockaddr_in6) the family of the address type
1272 * must be used to distengish the address len 1280 * must be used to distengish the address length (note that this
1273 * representation is termed a "packed array" 1281 * representation is termed a "packed array" of addresses). The caller
1274 * specifies the number of addresses in the a 1282 * specifies the number of addresses in the array with addrcnt.
1275 * 1283 *
1276 * On success, sctp_connectx() returns 0. It 1284 * On success, sctp_connectx() returns 0. It also sets the assoc_id to
1277 * the association id of the new association. 1285 * the association id of the new association. On failure, sctp_connectx()
1278 * returns -1, and sets errno to the appropri 1286 * returns -1, and sets errno to the appropriate error code. The assoc_id
1279 * is not touched by the kernel. 1287 * is not touched by the kernel.
1280 * 1288 *
1281 * For SCTP, the port given in each socket ad 1289 * For SCTP, the port given in each socket address must be the same, or
1282 * sctp_connectx() will fail, setting errno t 1290 * sctp_connectx() will fail, setting errno to EINVAL.
1283 * 1291 *
1284 * An application can use sctp_connectx to in 1292 * An application can use sctp_connectx to initiate an association with
1285 * an endpoint that is multi-homed. Much lik 1293 * an endpoint that is multi-homed. Much like sctp_bindx() this call
1286 * allows a caller to specify multiple addres 1294 * allows a caller to specify multiple addresses at which a peer can be
1287 * reached. The way the SCTP stack uses the 1295 * reached. The way the SCTP stack uses the list of addresses to set up
1288 * the association is implementation dependen 1296 * the association is implementation dependent. This function only
1289 * specifies that the stack will try to make 1297 * specifies that the stack will try to make use of all the addresses in
1290 * the list when needed. 1298 * the list when needed.
1291 * 1299 *
1292 * Note that the list of addresses passed in 1300 * Note that the list of addresses passed in is only used for setting up
1293 * the association. It does not necessarily 1301 * the association. It does not necessarily equal the set of addresses
1294 * the peer uses for the resulting associatio 1302 * the peer uses for the resulting association. If the caller wants to
1295 * find out the set of peer addresses, it mus 1303 * find out the set of peer addresses, it must use sctp_getpaddrs() to
1296 * retrieve them after the association has be 1304 * retrieve them after the association has been set up.
1297 * 1305 *
1298 * Basically do nothing but copying the addre 1306 * Basically do nothing but copying the addresses from user to kernel
1299 * land and invoking either sctp_connectx(). 1307 * land and invoking either sctp_connectx(). This is used for tunneling
1300 * the sctp_connectx() request through sctp_s 1308 * the sctp_connectx() request through sctp_setsockopt() from userspace.
1301 * 1309 *
1302 * On exit there is no need to do sockfd_put( 1310 * On exit there is no need to do sockfd_put(), sys_setsockopt() does
1303 * it. 1311 * it.
1304 * 1312 *
1305 * sk The sk of the socket 1313 * sk The sk of the socket
1306 * addrs The pointer to the addresses !! 1314 * addrs The pointer to the addresses in user land
1307 * addrssize Size of the addrs buffer 1315 * addrssize Size of the addrs buffer
1308 * 1316 *
1309 * Returns >=0 if ok, <0 errno code on error. 1317 * Returns >=0 if ok, <0 errno code on error.
1310 */ 1318 */
1311 static int __sctp_setsockopt_connectx(struct !! 1319 static int __sctp_setsockopt_connectx(struct sock *sk,
1312 int add !! 1320 struct sockaddr __user *addrs,
>> 1321 int addrs_size,
>> 1322 sctp_assoc_t *assoc_id)
1313 { 1323 {
>> 1324 struct sockaddr *kaddrs;
1314 int err = 0, flags = 0; 1325 int err = 0, flags = 0;
1315 1326
1316 pr_debug("%s: sk:%p addrs:%p addrs_si 1327 pr_debug("%s: sk:%p addrs:%p addrs_size:%d\n",
1317 __func__, sk, kaddrs, addrs_ !! 1328 __func__, sk, addrs, addrs_size);
1318 1329
1319 /* make sure the 1st addr's sa_family 1330 /* make sure the 1st addr's sa_family is accessible later */
1320 if (unlikely(addrs_size < sizeof(sa_f 1331 if (unlikely(addrs_size < sizeof(sa_family_t)))
1321 return -EINVAL; 1332 return -EINVAL;
1322 1333
>> 1334 kaddrs = memdup_user(addrs, addrs_size);
>> 1335 if (IS_ERR(kaddrs))
>> 1336 return PTR_ERR(kaddrs) == -EFAULT ? -EINVAL : PTR_ERR(kaddrs);
>> 1337
1323 /* Allow security module to validate 1338 /* Allow security module to validate connectx addresses. */
1324 err = security_sctp_bind_connect(sk, 1339 err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_CONNECTX,
1325 (str 1340 (struct sockaddr *)kaddrs,
1326 add 1341 addrs_size);
1327 if (err) 1342 if (err)
1328 return err; !! 1343 goto out_free;
1329 1344
1330 /* in-kernel sockets don't generally 1345 /* in-kernel sockets don't generally have a file allocated to them
1331 * if all they do is call sock_create 1346 * if all they do is call sock_create_kern().
1332 */ 1347 */
1333 if (sk->sk_socket->file) 1348 if (sk->sk_socket->file)
1334 flags = sk->sk_socket->file-> 1349 flags = sk->sk_socket->file->f_flags;
1335 1350
1336 return __sctp_connect(sk, kaddrs, add !! 1351 err = __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
>> 1352
>> 1353 out_free:
>> 1354 kfree(kaddrs);
>> 1355
>> 1356 return err;
1337 } 1357 }
1338 1358
1339 /* 1359 /*
1340 * This is an older interface. It's kept for 1360 * This is an older interface. It's kept for backward compatibility
1341 * to the option that doesn't provide associa 1361 * to the option that doesn't provide association id.
1342 */ 1362 */
1343 static int sctp_setsockopt_connectx_old(struc 1363 static int sctp_setsockopt_connectx_old(struct sock *sk,
1344 struc !! 1364 struct sockaddr __user *addrs,
1345 int a 1365 int addrs_size)
1346 { 1366 {
1347 return __sctp_setsockopt_connectx(sk, !! 1367 return __sctp_setsockopt_connectx(sk, addrs, addrs_size, NULL);
1348 } 1368 }
1349 1369
1350 /* 1370 /*
1351 * New interface for the API. The since the 1371 * New interface for the API. The since the API is done with a socket
1352 * option, to make it simple we feed back the 1372 * option, to make it simple we feed back the association id is as a return
1353 * indication to the call. Error is always n 1373 * indication to the call. Error is always negative and association id is
1354 * always positive. 1374 * always positive.
1355 */ 1375 */
1356 static int sctp_setsockopt_connectx(struct so 1376 static int sctp_setsockopt_connectx(struct sock *sk,
1357 struct so !! 1377 struct sockaddr __user *addrs,
1358 int addrs 1378 int addrs_size)
1359 { 1379 {
1360 sctp_assoc_t assoc_id = 0; 1380 sctp_assoc_t assoc_id = 0;
1361 int err = 0; 1381 int err = 0;
1362 1382
1363 err = __sctp_setsockopt_connectx(sk, !! 1383 err = __sctp_setsockopt_connectx(sk, addrs, addrs_size, &assoc_id);
1364 1384
1365 if (err) 1385 if (err)
1366 return err; 1386 return err;
1367 else 1387 else
1368 return assoc_id; 1388 return assoc_id;
1369 } 1389 }
1370 1390
1371 /* 1391 /*
1372 * New (hopefully final) interface for the AP 1392 * New (hopefully final) interface for the API.
1373 * We use the sctp_getaddrs_old structure so 1393 * We use the sctp_getaddrs_old structure so that use-space library
1374 * can avoid any unnecessary allocations. The 1394 * can avoid any unnecessary allocations. The only different part
1375 * is that we store the actual length of the 1395 * is that we store the actual length of the address buffer into the
1376 * addrs_num structure member. That way we ca 1396 * addrs_num structure member. That way we can re-use the existing
1377 * code. 1397 * code.
1378 */ 1398 */
1379 #ifdef CONFIG_COMPAT 1399 #ifdef CONFIG_COMPAT
1380 struct compat_sctp_getaddrs_old { 1400 struct compat_sctp_getaddrs_old {
1381 sctp_assoc_t assoc_id; 1401 sctp_assoc_t assoc_id;
1382 s32 addr_num; 1402 s32 addr_num;
1383 compat_uptr_t addrs; /* st 1403 compat_uptr_t addrs; /* struct sockaddr * */
1384 }; 1404 };
1385 #endif 1405 #endif
1386 1406
1387 static int sctp_getsockopt_connectx3(struct s 1407 static int sctp_getsockopt_connectx3(struct sock *sk, int len,
1388 char __u 1408 char __user *optval,
1389 int __us 1409 int __user *optlen)
1390 { 1410 {
1391 struct sctp_getaddrs_old param; 1411 struct sctp_getaddrs_old param;
1392 sctp_assoc_t assoc_id = 0; 1412 sctp_assoc_t assoc_id = 0;
1393 struct sockaddr *kaddrs; <<
1394 int err = 0; 1413 int err = 0;
1395 1414
1396 #ifdef CONFIG_COMPAT 1415 #ifdef CONFIG_COMPAT
1397 if (in_compat_syscall()) { 1416 if (in_compat_syscall()) {
1398 struct compat_sctp_getaddrs_o 1417 struct compat_sctp_getaddrs_old param32;
1399 1418
1400 if (len < sizeof(param32)) 1419 if (len < sizeof(param32))
1401 return -EINVAL; 1420 return -EINVAL;
1402 if (copy_from_user(¶m32, 1421 if (copy_from_user(¶m32, optval, sizeof(param32)))
1403 return -EFAULT; 1422 return -EFAULT;
1404 1423
1405 param.assoc_id = param32.asso 1424 param.assoc_id = param32.assoc_id;
1406 param.addr_num = param32.addr 1425 param.addr_num = param32.addr_num;
1407 param.addrs = compat_ptr(para 1426 param.addrs = compat_ptr(param32.addrs);
1408 } else 1427 } else
1409 #endif 1428 #endif
1410 { 1429 {
1411 if (len < sizeof(param)) 1430 if (len < sizeof(param))
1412 return -EINVAL; 1431 return -EINVAL;
1413 if (copy_from_user(¶m, op 1432 if (copy_from_user(¶m, optval, sizeof(param)))
1414 return -EFAULT; 1433 return -EFAULT;
1415 } 1434 }
1416 1435
1417 kaddrs = memdup_user(param.addrs, par !! 1436 err = __sctp_setsockopt_connectx(sk, (struct sockaddr __user *)
1418 if (IS_ERR(kaddrs)) !! 1437 param.addrs, param.addr_num,
1419 return PTR_ERR(kaddrs); !! 1438 &assoc_id);
1420 <<
1421 err = __sctp_setsockopt_connectx(sk, <<
1422 kfree(kaddrs); <<
1423 if (err == 0 || err == -EINPROGRESS) 1439 if (err == 0 || err == -EINPROGRESS) {
1424 if (copy_to_user(optval, &ass 1440 if (copy_to_user(optval, &assoc_id, sizeof(assoc_id)))
1425 return -EFAULT; 1441 return -EFAULT;
1426 if (put_user(sizeof(assoc_id) 1442 if (put_user(sizeof(assoc_id), optlen))
1427 return -EFAULT; 1443 return -EFAULT;
1428 } 1444 }
1429 1445
1430 return err; 1446 return err;
1431 } 1447 }
1432 1448
1433 /* API 3.1.4 close() - UDP Style Syntax 1449 /* API 3.1.4 close() - UDP Style Syntax
1434 * Applications use close() to perform gracef 1450 * Applications use close() to perform graceful shutdown (as described in
1435 * Section 10.1 of [SCTP]) on ALL the associa 1451 * Section 10.1 of [SCTP]) on ALL the associations currently represented
1436 * by a UDP-style socket. 1452 * by a UDP-style socket.
1437 * 1453 *
1438 * The syntax is 1454 * The syntax is
1439 * 1455 *
1440 * ret = close(int sd); 1456 * ret = close(int sd);
1441 * 1457 *
1442 * sd - the socket descriptor of the a 1458 * sd - the socket descriptor of the associations to be closed.
1443 * 1459 *
1444 * To gracefully shutdown a specific associat 1460 * To gracefully shutdown a specific association represented by the
1445 * UDP-style socket, an application should us 1461 * UDP-style socket, an application should use the sendmsg() call,
1446 * passing no user data, but including the ap 1462 * passing no user data, but including the appropriate flag in the
1447 * ancillary data (see Section xxxx). 1463 * ancillary data (see Section xxxx).
1448 * 1464 *
1449 * If sd in the close() call is a branched-of 1465 * If sd in the close() call is a branched-off socket representing only
1450 * one association, the shutdown is performed 1466 * one association, the shutdown is performed on that association only.
1451 * 1467 *
1452 * 4.1.6 close() - TCP Style Syntax 1468 * 4.1.6 close() - TCP Style Syntax
1453 * 1469 *
1454 * Applications use close() to gracefully clo 1470 * Applications use close() to gracefully close down an association.
1455 * 1471 *
1456 * The syntax is: 1472 * The syntax is:
1457 * 1473 *
1458 * int close(int sd); 1474 * int close(int sd);
1459 * 1475 *
1460 * sd - the socket descriptor of th 1476 * sd - the socket descriptor of the association to be closed.
1461 * 1477 *
1462 * After an application calls close() on a so 1478 * After an application calls close() on a socket descriptor, no further
1463 * socket operations will succeed on that des 1479 * socket operations will succeed on that descriptor.
1464 * 1480 *
1465 * API 7.1.4 SO_LINGER 1481 * API 7.1.4 SO_LINGER
1466 * 1482 *
1467 * An application using the TCP-style socket 1483 * An application using the TCP-style socket can use this option to
1468 * perform the SCTP ABORT primitive. The lin 1484 * perform the SCTP ABORT primitive. The linger option structure is:
1469 * 1485 *
1470 * struct linger { 1486 * struct linger {
1471 * int l_onoff; // opt 1487 * int l_onoff; // option on/off
1472 * int l_linger; // lin 1488 * int l_linger; // linger time
1473 * }; 1489 * };
1474 * 1490 *
1475 * To enable the option, set l_onoff to 1. I 1491 * 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 1492 * to 0, calling close() is the same as the ABORT primitive. If the
1477 * value is set to a negative value, the sets 1493 * value is set to a negative value, the setsockopt() call will return
1478 * an error. If the value is set to a positi 1494 * an error. If the value is set to a positive value linger_time, the
1479 * close() can be blocked for at most linger_ 1495 * close() can be blocked for at most linger_time ms. If the graceful
1480 * shutdown phase does not finish during this 1496 * shutdown phase does not finish during this period, close() will
1481 * return but the graceful shutdown phase con 1497 * return but the graceful shutdown phase continues in the system.
1482 */ 1498 */
1483 static void sctp_close(struct sock *sk, long 1499 static void sctp_close(struct sock *sk, long timeout)
1484 { 1500 {
1485 struct net *net = sock_net(sk); 1501 struct net *net = sock_net(sk);
1486 struct sctp_endpoint *ep; 1502 struct sctp_endpoint *ep;
1487 struct sctp_association *asoc; 1503 struct sctp_association *asoc;
1488 struct list_head *pos, *temp; 1504 struct list_head *pos, *temp;
1489 unsigned int data_was_unread; 1505 unsigned int data_was_unread;
1490 1506
1491 pr_debug("%s: sk:%p, timeout:%ld\n", 1507 pr_debug("%s: sk:%p, timeout:%ld\n", __func__, sk, timeout);
1492 1508
1493 lock_sock_nested(sk, SINGLE_DEPTH_NES 1509 lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
1494 sk->sk_shutdown = SHUTDOWN_MASK; 1510 sk->sk_shutdown = SHUTDOWN_MASK;
1495 inet_sk_set_state(sk, SCTP_SS_CLOSING 1511 inet_sk_set_state(sk, SCTP_SS_CLOSING);
1496 1512
1497 ep = sctp_sk(sk)->ep; 1513 ep = sctp_sk(sk)->ep;
1498 1514
1499 /* Clean up any skbs sitting on the r 1515 /* Clean up any skbs sitting on the receive queue. */
1500 data_was_unread = sctp_queue_purge_ul 1516 data_was_unread = sctp_queue_purge_ulpevents(&sk->sk_receive_queue);
1501 data_was_unread += sctp_queue_purge_u 1517 data_was_unread += sctp_queue_purge_ulpevents(&sctp_sk(sk)->pd_lobby);
1502 1518
1503 /* Walk all associations on an endpoi 1519 /* Walk all associations on an endpoint. */
1504 list_for_each_safe(pos, temp, &ep->as 1520 list_for_each_safe(pos, temp, &ep->asocs) {
1505 asoc = list_entry(pos, struct 1521 asoc = list_entry(pos, struct sctp_association, asocs);
1506 1522
1507 if (sctp_style(sk, TCP)) { 1523 if (sctp_style(sk, TCP)) {
1508 /* A closed associati 1524 /* A closed association can still be in the list if
1509 * it belongs to a TC 1525 * it belongs to a TCP-style listening socket that is
1510 * not yet accepted. 1526 * not yet accepted. If so, free it. If not, send an
1511 * ABORT or SHUTDOWN 1527 * ABORT or SHUTDOWN based on the linger options.
1512 */ 1528 */
1513 if (sctp_state(asoc, 1529 if (sctp_state(asoc, CLOSED)) {
1514 sctp_associat 1530 sctp_association_free(asoc);
1515 continue; 1531 continue;
1516 } 1532 }
1517 } 1533 }
1518 1534
1519 if (data_was_unread || !skb_q 1535 if (data_was_unread || !skb_queue_empty(&asoc->ulpq.lobby) ||
1520 !skb_queue_empty(&asoc->u 1536 !skb_queue_empty(&asoc->ulpq.reasm) ||
1521 !skb_queue_empty(&asoc->u 1537 !skb_queue_empty(&asoc->ulpq.reasm_uo) ||
1522 (sock_flag(sk, SOCK_LINGE 1538 (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)) {
1523 struct sctp_chunk *ch 1539 struct sctp_chunk *chunk;
1524 1540
1525 chunk = sctp_make_abo 1541 chunk = sctp_make_abort_user(asoc, NULL, 0);
1526 sctp_primitive_ABORT( 1542 sctp_primitive_ABORT(net, asoc, chunk);
1527 } else 1543 } else
1528 sctp_primitive_SHUTDO 1544 sctp_primitive_SHUTDOWN(net, asoc, NULL);
1529 } 1545 }
1530 1546
1531 /* On a TCP-style socket, block for a 1547 /* On a TCP-style socket, block for at most linger_time if set. */
1532 if (sctp_style(sk, TCP) && timeout) 1548 if (sctp_style(sk, TCP) && timeout)
1533 sctp_wait_for_close(sk, timeo 1549 sctp_wait_for_close(sk, timeout);
1534 1550
1535 /* This will run the backlog queue. 1551 /* This will run the backlog queue. */
1536 release_sock(sk); 1552 release_sock(sk);
1537 1553
1538 /* Supposedly, no process has access 1554 /* Supposedly, no process has access to the socket, but
1539 * the net layers still may. 1555 * the net layers still may.
1540 * Also, sctp_destroy_sock() needs to 1556 * Also, sctp_destroy_sock() needs to be called with addr_wq_lock
1541 * held and that should be grabbed be 1557 * held and that should be grabbed before socket lock.
1542 */ 1558 */
1543 spin_lock_bh(&net->sctp.addr_wq_lock) 1559 spin_lock_bh(&net->sctp.addr_wq_lock);
1544 bh_lock_sock_nested(sk); 1560 bh_lock_sock_nested(sk);
1545 1561
1546 /* Hold the sock, since sk_common_rel 1562 /* Hold the sock, since sk_common_release() will put sock_put()
1547 * and we have just a little more cle 1563 * and we have just a little more cleanup.
1548 */ 1564 */
1549 sock_hold(sk); 1565 sock_hold(sk);
1550 sk_common_release(sk); 1566 sk_common_release(sk);
1551 1567
1552 bh_unlock_sock(sk); 1568 bh_unlock_sock(sk);
1553 spin_unlock_bh(&net->sctp.addr_wq_loc 1569 spin_unlock_bh(&net->sctp.addr_wq_lock);
1554 1570
1555 sock_put(sk); 1571 sock_put(sk);
1556 1572
1557 SCTP_DBG_OBJCNT_DEC(sock); 1573 SCTP_DBG_OBJCNT_DEC(sock);
1558 } 1574 }
1559 1575
1560 /* Handle EPIPE error. */ 1576 /* Handle EPIPE error. */
1561 static int sctp_error(struct sock *sk, int fl 1577 static int sctp_error(struct sock *sk, int flags, int err)
1562 { 1578 {
1563 if (err == -EPIPE) 1579 if (err == -EPIPE)
1564 err = sock_error(sk) ? : -EPI 1580 err = sock_error(sk) ? : -EPIPE;
1565 if (err == -EPIPE && !(flags & MSG_NO 1581 if (err == -EPIPE && !(flags & MSG_NOSIGNAL))
1566 send_sig(SIGPIPE, current, 0) 1582 send_sig(SIGPIPE, current, 0);
1567 return err; 1583 return err;
1568 } 1584 }
1569 1585
1570 /* API 3.1.3 sendmsg() - UDP Style Syntax 1586 /* API 3.1.3 sendmsg() - UDP Style Syntax
1571 * 1587 *
1572 * An application uses sendmsg() and recvmsg( 1588 * An application uses sendmsg() and recvmsg() calls to transmit data to
1573 * and receive data from its peer. 1589 * and receive data from its peer.
1574 * 1590 *
1575 * ssize_t sendmsg(int socket, const struct 1591 * ssize_t sendmsg(int socket, const struct msghdr *message,
1576 * int flags); 1592 * int flags);
1577 * 1593 *
1578 * socket - the socket descriptor of the en 1594 * socket - the socket descriptor of the endpoint.
1579 * message - pointer to the msghdr structure 1595 * message - pointer to the msghdr structure which contains a single
1580 * user message and possibly some 1596 * user message and possibly some ancillary data.
1581 * 1597 *
1582 * See Section 5 for complete desc 1598 * See Section 5 for complete description of the data
1583 * structures. 1599 * structures.
1584 * 1600 *
1585 * flags - flags sent or received with the 1601 * flags - flags sent or received with the user message, see Section
1586 * 5 for complete description of t 1602 * 5 for complete description of the flags.
1587 * 1603 *
1588 * Note: This function could use a rewrite e 1604 * Note: This function could use a rewrite especially when explicit
1589 * connect support comes in. 1605 * connect support comes in.
1590 */ 1606 */
1591 /* BUG: We do not implement the equivalent o 1607 /* BUG: We do not implement the equivalent of sk_stream_wait_memory(). */
1592 1608
1593 static int sctp_msghdr_parse(const struct msg 1609 static int sctp_msghdr_parse(const struct msghdr *msg,
1594 struct sctp_cmsg 1610 struct sctp_cmsgs *cmsgs);
1595 1611
1596 static int sctp_sendmsg_parse(struct sock *sk 1612 static int sctp_sendmsg_parse(struct sock *sk, struct sctp_cmsgs *cmsgs,
1597 struct sctp_snd 1613 struct sctp_sndrcvinfo *srinfo,
1598 const struct ms 1614 const struct msghdr *msg, size_t msg_len)
1599 { 1615 {
1600 __u16 sflags; 1616 __u16 sflags;
1601 int err; 1617 int err;
1602 1618
1603 if (sctp_sstate(sk, LISTENING) && sct 1619 if (sctp_sstate(sk, LISTENING) && sctp_style(sk, TCP))
1604 return -EPIPE; 1620 return -EPIPE;
1605 1621
1606 if (msg_len > sk->sk_sndbuf) 1622 if (msg_len > sk->sk_sndbuf)
1607 return -EMSGSIZE; 1623 return -EMSGSIZE;
1608 1624
1609 memset(cmsgs, 0, sizeof(*cmsgs)); 1625 memset(cmsgs, 0, sizeof(*cmsgs));
1610 err = sctp_msghdr_parse(msg, cmsgs); 1626 err = sctp_msghdr_parse(msg, cmsgs);
1611 if (err) { 1627 if (err) {
1612 pr_debug("%s: msghdr parse er 1628 pr_debug("%s: msghdr parse err:%x\n", __func__, err);
1613 return err; 1629 return err;
1614 } 1630 }
1615 1631
1616 memset(srinfo, 0, sizeof(*srinfo)); 1632 memset(srinfo, 0, sizeof(*srinfo));
1617 if (cmsgs->srinfo) { 1633 if (cmsgs->srinfo) {
1618 srinfo->sinfo_stream = cmsgs- 1634 srinfo->sinfo_stream = cmsgs->srinfo->sinfo_stream;
1619 srinfo->sinfo_flags = cmsgs-> 1635 srinfo->sinfo_flags = cmsgs->srinfo->sinfo_flags;
1620 srinfo->sinfo_ppid = cmsgs->s 1636 srinfo->sinfo_ppid = cmsgs->srinfo->sinfo_ppid;
1621 srinfo->sinfo_context = cmsgs 1637 srinfo->sinfo_context = cmsgs->srinfo->sinfo_context;
1622 srinfo->sinfo_assoc_id = cmsg 1638 srinfo->sinfo_assoc_id = cmsgs->srinfo->sinfo_assoc_id;
1623 srinfo->sinfo_timetolive = cm 1639 srinfo->sinfo_timetolive = cmsgs->srinfo->sinfo_timetolive;
1624 } 1640 }
1625 1641
1626 if (cmsgs->sinfo) { 1642 if (cmsgs->sinfo) {
1627 srinfo->sinfo_stream = cmsgs- 1643 srinfo->sinfo_stream = cmsgs->sinfo->snd_sid;
1628 srinfo->sinfo_flags = cmsgs-> 1644 srinfo->sinfo_flags = cmsgs->sinfo->snd_flags;
1629 srinfo->sinfo_ppid = cmsgs->s 1645 srinfo->sinfo_ppid = cmsgs->sinfo->snd_ppid;
1630 srinfo->sinfo_context = cmsgs 1646 srinfo->sinfo_context = cmsgs->sinfo->snd_context;
1631 srinfo->sinfo_assoc_id = cmsg 1647 srinfo->sinfo_assoc_id = cmsgs->sinfo->snd_assoc_id;
1632 } 1648 }
1633 1649
1634 if (cmsgs->prinfo) { 1650 if (cmsgs->prinfo) {
1635 srinfo->sinfo_timetolive = cm 1651 srinfo->sinfo_timetolive = cmsgs->prinfo->pr_value;
1636 SCTP_PR_SET_POLICY(srinfo->si 1652 SCTP_PR_SET_POLICY(srinfo->sinfo_flags,
1637 cmsgs->pri 1653 cmsgs->prinfo->pr_policy);
1638 } 1654 }
1639 1655
1640 sflags = srinfo->sinfo_flags; 1656 sflags = srinfo->sinfo_flags;
1641 if (!sflags && msg_len) 1657 if (!sflags && msg_len)
1642 return 0; 1658 return 0;
1643 1659
1644 if (sctp_style(sk, TCP) && (sflags & 1660 if (sctp_style(sk, TCP) && (sflags & (SCTP_EOF | SCTP_ABORT)))
1645 return -EINVAL; 1661 return -EINVAL;
1646 1662
1647 if (((sflags & SCTP_EOF) && msg_len > 1663 if (((sflags & SCTP_EOF) && msg_len > 0) ||
1648 (!(sflags & (SCTP_EOF | SCTP_ABOR 1664 (!(sflags & (SCTP_EOF | SCTP_ABORT)) && msg_len == 0))
1649 return -EINVAL; 1665 return -EINVAL;
1650 1666
1651 if ((sflags & SCTP_ADDR_OVER) && !msg 1667 if ((sflags & SCTP_ADDR_OVER) && !msg->msg_name)
1652 return -EINVAL; 1668 return -EINVAL;
1653 1669
1654 return 0; 1670 return 0;
1655 } 1671 }
1656 1672
1657 static int sctp_sendmsg_new_asoc(struct sock 1673 static int sctp_sendmsg_new_asoc(struct sock *sk, __u16 sflags,
1658 struct sctp_ 1674 struct sctp_cmsgs *cmsgs,
1659 union sctp_a 1675 union sctp_addr *daddr,
1660 struct sctp_ 1676 struct sctp_transport **tp)
1661 { 1677 {
1662 struct sctp_endpoint *ep = sctp_sk(sk 1678 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
1663 struct sctp_association *asoc; 1679 struct sctp_association *asoc;
1664 struct cmsghdr *cmsg; 1680 struct cmsghdr *cmsg;
1665 __be32 flowinfo = 0; 1681 __be32 flowinfo = 0;
1666 struct sctp_af *af; 1682 struct sctp_af *af;
1667 int err; 1683 int err;
1668 1684
1669 *tp = NULL; 1685 *tp = NULL;
1670 1686
1671 if (sflags & (SCTP_EOF | SCTP_ABORT)) 1687 if (sflags & (SCTP_EOF | SCTP_ABORT))
1672 return -EINVAL; 1688 return -EINVAL;
1673 1689
1674 if (sctp_style(sk, TCP) && (sctp_ssta 1690 if (sctp_style(sk, TCP) && (sctp_sstate(sk, ESTABLISHED) ||
1675 sctp_ssta 1691 sctp_sstate(sk, CLOSING)))
1676 return -EADDRNOTAVAIL; 1692 return -EADDRNOTAVAIL;
1677 1693
1678 /* Label connection socket for first 1694 /* Label connection socket for first association 1-to-many
1679 * style for client sequence socket() 1695 * style for client sequence socket()->sendmsg(). This
1680 * needs to be done before sctp_assoc 1696 * needs to be done before sctp_assoc_add_peer() as that will
1681 * set up the initial packet that nee 1697 * set up the initial packet that needs to account for any
1682 * security ip options (CIPSO/CALIPSO 1698 * security ip options (CIPSO/CALIPSO) added to the packet.
1683 */ 1699 */
1684 af = sctp_get_af_specific(daddr->sa.s 1700 af = sctp_get_af_specific(daddr->sa.sa_family);
1685 if (!af) 1701 if (!af)
1686 return -EINVAL; 1702 return -EINVAL;
1687 err = security_sctp_bind_connect(sk, 1703 err = security_sctp_bind_connect(sk, SCTP_SENDMSG_CONNECT,
1688 (str 1704 (struct sockaddr *)daddr,
1689 af-> 1705 af->sockaddr_len);
1690 if (err < 0) 1706 if (err < 0)
1691 return err; 1707 return err;
1692 1708
1693 err = sctp_connect_new_asoc(ep, daddr 1709 err = sctp_connect_new_asoc(ep, daddr, cmsgs->init, tp);
1694 if (err) 1710 if (err)
1695 return err; 1711 return err;
1696 asoc = (*tp)->asoc; 1712 asoc = (*tp)->asoc;
1697 1713
1698 if (!cmsgs->addrs_msg) 1714 if (!cmsgs->addrs_msg)
1699 return 0; 1715 return 0;
1700 1716
1701 if (daddr->sa.sa_family == AF_INET6) 1717 if (daddr->sa.sa_family == AF_INET6)
1702 flowinfo = daddr->v6.sin6_flo 1718 flowinfo = daddr->v6.sin6_flowinfo;
1703 1719
1704 /* sendv addr list parse */ 1720 /* sendv addr list parse */
1705 for_each_cmsghdr(cmsg, cmsgs->addrs_m 1721 for_each_cmsghdr(cmsg, cmsgs->addrs_msg) {
1706 union sctp_addr _daddr; 1722 union sctp_addr _daddr;
1707 int dlen; 1723 int dlen;
1708 1724
1709 if (cmsg->cmsg_level != IPPRO 1725 if (cmsg->cmsg_level != IPPROTO_SCTP ||
1710 (cmsg->cmsg_type != SCTP_ 1726 (cmsg->cmsg_type != SCTP_DSTADDRV4 &&
1711 cmsg->cmsg_type != SCTP_ 1727 cmsg->cmsg_type != SCTP_DSTADDRV6))
1712 continue; 1728 continue;
1713 1729
1714 daddr = &_daddr; 1730 daddr = &_daddr;
1715 memset(daddr, 0, sizeof(*dadd 1731 memset(daddr, 0, sizeof(*daddr));
1716 dlen = cmsg->cmsg_len - sizeo 1732 dlen = cmsg->cmsg_len - sizeof(struct cmsghdr);
1717 if (cmsg->cmsg_type == SCTP_D 1733 if (cmsg->cmsg_type == SCTP_DSTADDRV4) {
1718 if (dlen < sizeof(str 1734 if (dlen < sizeof(struct in_addr)) {
1719 err = -EINVAL 1735 err = -EINVAL;
1720 goto free; 1736 goto free;
1721 } 1737 }
1722 1738
1723 dlen = sizeof(struct 1739 dlen = sizeof(struct in_addr);
1724 daddr->v4.sin_family 1740 daddr->v4.sin_family = AF_INET;
1725 daddr->v4.sin_port = 1741 daddr->v4.sin_port = htons(asoc->peer.port);
1726 memcpy(&daddr->v4.sin 1742 memcpy(&daddr->v4.sin_addr, CMSG_DATA(cmsg), dlen);
1727 } else { 1743 } else {
1728 if (dlen < sizeof(str 1744 if (dlen < sizeof(struct in6_addr)) {
1729 err = -EINVAL 1745 err = -EINVAL;
1730 goto free; 1746 goto free;
1731 } 1747 }
1732 1748
1733 dlen = sizeof(struct 1749 dlen = sizeof(struct in6_addr);
1734 daddr->v6.sin6_flowin 1750 daddr->v6.sin6_flowinfo = flowinfo;
1735 daddr->v6.sin6_family 1751 daddr->v6.sin6_family = AF_INET6;
1736 daddr->v6.sin6_port = 1752 daddr->v6.sin6_port = htons(asoc->peer.port);
1737 memcpy(&daddr->v6.sin 1753 memcpy(&daddr->v6.sin6_addr, CMSG_DATA(cmsg), dlen);
1738 } 1754 }
1739 1755
1740 err = sctp_connect_add_peer(a 1756 err = sctp_connect_add_peer(asoc, daddr, sizeof(*daddr));
1741 if (err) 1757 if (err)
1742 goto free; 1758 goto free;
1743 } 1759 }
1744 1760
1745 return 0; 1761 return 0;
1746 1762
1747 free: 1763 free:
1748 sctp_association_free(asoc); 1764 sctp_association_free(asoc);
1749 return err; 1765 return err;
1750 } 1766 }
1751 1767
1752 static int sctp_sendmsg_check_sflags(struct s 1768 static int sctp_sendmsg_check_sflags(struct sctp_association *asoc,
1753 __u16 sf 1769 __u16 sflags, struct msghdr *msg,
1754 size_t m 1770 size_t msg_len)
1755 { 1771 {
1756 struct sock *sk = asoc->base.sk; 1772 struct sock *sk = asoc->base.sk;
1757 struct net *net = sock_net(sk); 1773 struct net *net = sock_net(sk);
1758 1774
1759 if (sctp_state(asoc, CLOSED) && sctp_ 1775 if (sctp_state(asoc, CLOSED) && sctp_style(sk, TCP))
1760 return -EPIPE; 1776 return -EPIPE;
1761 1777
1762 if ((sflags & SCTP_SENDALL) && sctp_s 1778 if ((sflags & SCTP_SENDALL) && sctp_style(sk, UDP) &&
1763 !sctp_state(asoc, ESTABLISHED)) 1779 !sctp_state(asoc, ESTABLISHED))
1764 return 0; 1780 return 0;
1765 1781
1766 if (sflags & SCTP_EOF) { 1782 if (sflags & SCTP_EOF) {
1767 pr_debug("%s: shutting down a 1783 pr_debug("%s: shutting down association:%p\n", __func__, asoc);
1768 sctp_primitive_SHUTDOWN(net, 1784 sctp_primitive_SHUTDOWN(net, asoc, NULL);
1769 1785
1770 return 0; 1786 return 0;
1771 } 1787 }
1772 1788
1773 if (sflags & SCTP_ABORT) { 1789 if (sflags & SCTP_ABORT) {
1774 struct sctp_chunk *chunk; 1790 struct sctp_chunk *chunk;
1775 1791
1776 chunk = sctp_make_abort_user( 1792 chunk = sctp_make_abort_user(asoc, msg, msg_len);
1777 if (!chunk) 1793 if (!chunk)
1778 return -ENOMEM; 1794 return -ENOMEM;
1779 1795
1780 pr_debug("%s: aborting associ 1796 pr_debug("%s: aborting association:%p\n", __func__, asoc);
1781 sctp_primitive_ABORT(net, aso 1797 sctp_primitive_ABORT(net, asoc, chunk);
1782 iov_iter_revert(&msg->msg_ite 1798 iov_iter_revert(&msg->msg_iter, msg_len);
1783 1799
1784 return 0; 1800 return 0;
1785 } 1801 }
1786 1802
1787 return 1; 1803 return 1;
1788 } 1804 }
1789 1805
1790 static int sctp_sendmsg_to_asoc(struct sctp_a 1806 static int sctp_sendmsg_to_asoc(struct sctp_association *asoc,
1791 struct msghdr 1807 struct msghdr *msg, size_t msg_len,
1792 struct sctp_t 1808 struct sctp_transport *transport,
1793 struct sctp_s 1809 struct sctp_sndrcvinfo *sinfo)
1794 { 1810 {
1795 struct sock *sk = asoc->base.sk; 1811 struct sock *sk = asoc->base.sk;
1796 struct sctp_sock *sp = sctp_sk(sk); 1812 struct sctp_sock *sp = sctp_sk(sk);
1797 struct net *net = sock_net(sk); 1813 struct net *net = sock_net(sk);
1798 struct sctp_datamsg *datamsg; 1814 struct sctp_datamsg *datamsg;
1799 bool wait_connect = false; 1815 bool wait_connect = false;
1800 struct sctp_chunk *chunk; 1816 struct sctp_chunk *chunk;
1801 long timeo; 1817 long timeo;
1802 int err; 1818 int err;
1803 1819
1804 if (sinfo->sinfo_stream >= asoc->stre 1820 if (sinfo->sinfo_stream >= asoc->stream.outcnt) {
1805 err = -EINVAL; 1821 err = -EINVAL;
1806 goto err; 1822 goto err;
1807 } 1823 }
1808 1824
1809 if (unlikely(!SCTP_SO(&asoc->stream, 1825 if (unlikely(!SCTP_SO(&asoc->stream, sinfo->sinfo_stream)->ext)) {
1810 err = sctp_stream_init_ext(&a 1826 err = sctp_stream_init_ext(&asoc->stream, sinfo->sinfo_stream);
1811 if (err) 1827 if (err)
1812 goto err; 1828 goto err;
1813 } 1829 }
1814 1830
1815 if (sp->disable_fragments && msg_len 1831 if (sp->disable_fragments && msg_len > asoc->frag_point) {
1816 err = -EMSGSIZE; 1832 err = -EMSGSIZE;
1817 goto err; 1833 goto err;
1818 } 1834 }
1819 1835
1820 if (asoc->pmtu_pending) { 1836 if (asoc->pmtu_pending) {
1821 if (sp->param_flags & SPP_PMT 1837 if (sp->param_flags & SPP_PMTUD_ENABLE)
1822 sctp_assoc_sync_pmtu( 1838 sctp_assoc_sync_pmtu(asoc);
1823 asoc->pmtu_pending = 0; 1839 asoc->pmtu_pending = 0;
1824 } 1840 }
1825 1841
1826 if (sctp_wspace(asoc) < (int)msg_len) 1842 if (sctp_wspace(asoc) < (int)msg_len)
1827 sctp_prsctp_prune(asoc, sinfo 1843 sctp_prsctp_prune(asoc, sinfo, msg_len - sctp_wspace(asoc));
1828 1844
>> 1845 if (sk_under_memory_pressure(sk))
>> 1846 sk_mem_reclaim(sk);
>> 1847
1829 if (sctp_wspace(asoc) <= 0 || !sk_wme 1848 if (sctp_wspace(asoc) <= 0 || !sk_wmem_schedule(sk, msg_len)) {
1830 timeo = sock_sndtimeo(sk, msg 1849 timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
1831 err = sctp_wait_for_sndbuf(as 1850 err = sctp_wait_for_sndbuf(asoc, &timeo, msg_len);
1832 if (err) 1851 if (err)
1833 goto err; 1852 goto err;
1834 if (unlikely(sinfo->sinfo_str 1853 if (unlikely(sinfo->sinfo_stream >= asoc->stream.outcnt)) {
1835 err = -EINVAL; 1854 err = -EINVAL;
1836 goto err; 1855 goto err;
1837 } 1856 }
1838 } 1857 }
1839 1858
1840 if (sctp_state(asoc, CLOSED)) { 1859 if (sctp_state(asoc, CLOSED)) {
1841 err = sctp_primitive_ASSOCIAT 1860 err = sctp_primitive_ASSOCIATE(net, asoc, NULL);
1842 if (err) 1861 if (err)
1843 goto err; 1862 goto err;
1844 1863
1845 if (asoc->ep->intl_enable) { 1864 if (asoc->ep->intl_enable) {
1846 timeo = sock_sndtimeo 1865 timeo = sock_sndtimeo(sk, 0);
1847 err = sctp_wait_for_c 1866 err = sctp_wait_for_connect(asoc, &timeo);
1848 if (err) { 1867 if (err) {
1849 err = -ESRCH; 1868 err = -ESRCH;
1850 goto err; 1869 goto err;
1851 } 1870 }
1852 } else { 1871 } else {
1853 wait_connect = true; 1872 wait_connect = true;
1854 } 1873 }
1855 1874
1856 pr_debug("%s: we associated p 1875 pr_debug("%s: we associated primitively\n", __func__);
1857 } 1876 }
1858 1877
1859 datamsg = sctp_datamsg_from_user(asoc 1878 datamsg = sctp_datamsg_from_user(asoc, sinfo, &msg->msg_iter);
1860 if (IS_ERR(datamsg)) { 1879 if (IS_ERR(datamsg)) {
1861 err = PTR_ERR(datamsg); 1880 err = PTR_ERR(datamsg);
1862 goto err; 1881 goto err;
1863 } 1882 }
1864 1883
1865 asoc->force_delay = !!(msg->msg_flags 1884 asoc->force_delay = !!(msg->msg_flags & MSG_MORE);
1866 1885
1867 list_for_each_entry(chunk, &datamsg-> 1886 list_for_each_entry(chunk, &datamsg->chunks, frag_list) {
1868 sctp_chunk_hold(chunk); 1887 sctp_chunk_hold(chunk);
1869 sctp_set_owner_w(chunk); 1888 sctp_set_owner_w(chunk);
1870 chunk->transport = transport; 1889 chunk->transport = transport;
1871 } 1890 }
1872 1891
1873 err = sctp_primitive_SEND(net, asoc, 1892 err = sctp_primitive_SEND(net, asoc, datamsg);
1874 if (err) { 1893 if (err) {
1875 sctp_datamsg_free(datamsg); 1894 sctp_datamsg_free(datamsg);
1876 goto err; 1895 goto err;
1877 } 1896 }
1878 1897
1879 pr_debug("%s: we sent primitively\n", 1898 pr_debug("%s: we sent primitively\n", __func__);
1880 1899
1881 sctp_datamsg_put(datamsg); 1900 sctp_datamsg_put(datamsg);
1882 1901
1883 if (unlikely(wait_connect)) { 1902 if (unlikely(wait_connect)) {
1884 timeo = sock_sndtimeo(sk, msg 1903 timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
1885 sctp_wait_for_connect(asoc, & 1904 sctp_wait_for_connect(asoc, &timeo);
1886 } 1905 }
1887 1906
1888 err = msg_len; 1907 err = msg_len;
1889 1908
1890 err: 1909 err:
1891 return err; 1910 return err;
1892 } 1911 }
1893 1912
1894 static union sctp_addr *sctp_sendmsg_get_dadd 1913 static union sctp_addr *sctp_sendmsg_get_daddr(struct sock *sk,
1895 1914 const struct msghdr *msg,
1896 1915 struct sctp_cmsgs *cmsgs)
1897 { 1916 {
1898 union sctp_addr *daddr = NULL; 1917 union sctp_addr *daddr = NULL;
1899 int err; 1918 int err;
1900 1919
1901 if (!sctp_style(sk, UDP_HIGH_BANDWIDT 1920 if (!sctp_style(sk, UDP_HIGH_BANDWIDTH) && msg->msg_name) {
1902 int len = msg->msg_namelen; 1921 int len = msg->msg_namelen;
1903 1922
1904 if (len > sizeof(*daddr)) 1923 if (len > sizeof(*daddr))
1905 len = sizeof(*daddr); 1924 len = sizeof(*daddr);
1906 1925
1907 daddr = (union sctp_addr *)ms 1926 daddr = (union sctp_addr *)msg->msg_name;
1908 1927
1909 err = sctp_verify_addr(sk, da 1928 err = sctp_verify_addr(sk, daddr, len);
1910 if (err) 1929 if (err)
1911 return ERR_PTR(err); 1930 return ERR_PTR(err);
1912 } 1931 }
1913 1932
1914 return daddr; 1933 return daddr;
1915 } 1934 }
1916 1935
1917 static void sctp_sendmsg_update_sinfo(struct 1936 static void sctp_sendmsg_update_sinfo(struct sctp_association *asoc,
1918 struct 1937 struct sctp_sndrcvinfo *sinfo,
1919 struct 1938 struct sctp_cmsgs *cmsgs)
1920 { 1939 {
1921 if (!cmsgs->srinfo && !cmsgs->sinfo) 1940 if (!cmsgs->srinfo && !cmsgs->sinfo) {
1922 sinfo->sinfo_stream = asoc->d 1941 sinfo->sinfo_stream = asoc->default_stream;
1923 sinfo->sinfo_ppid = asoc->def 1942 sinfo->sinfo_ppid = asoc->default_ppid;
1924 sinfo->sinfo_context = asoc-> 1943 sinfo->sinfo_context = asoc->default_context;
1925 sinfo->sinfo_assoc_id = sctp_ 1944 sinfo->sinfo_assoc_id = sctp_assoc2id(asoc);
1926 1945
1927 if (!cmsgs->prinfo) 1946 if (!cmsgs->prinfo)
1928 sinfo->sinfo_flags = 1947 sinfo->sinfo_flags = asoc->default_flags;
1929 } 1948 }
1930 1949
1931 if (!cmsgs->srinfo && !cmsgs->prinfo) 1950 if (!cmsgs->srinfo && !cmsgs->prinfo)
1932 sinfo->sinfo_timetolive = aso 1951 sinfo->sinfo_timetolive = asoc->default_timetolive;
1933 1952
1934 if (cmsgs->authinfo) { 1953 if (cmsgs->authinfo) {
1935 /* Reuse sinfo_tsn to indicat 1954 /* Reuse sinfo_tsn to indicate that authinfo was set and
1936 * sinfo_ssn to save the keyi 1955 * sinfo_ssn to save the keyid on tx path.
1937 */ 1956 */
1938 sinfo->sinfo_tsn = 1; 1957 sinfo->sinfo_tsn = 1;
1939 sinfo->sinfo_ssn = cmsgs->aut 1958 sinfo->sinfo_ssn = cmsgs->authinfo->auth_keynumber;
1940 } 1959 }
1941 } 1960 }
1942 1961
1943 static int sctp_sendmsg(struct sock *sk, stru 1962 static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
1944 { 1963 {
1945 struct sctp_endpoint *ep = sctp_sk(sk 1964 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
1946 struct sctp_transport *transport = NU 1965 struct sctp_transport *transport = NULL;
1947 struct sctp_sndrcvinfo _sinfo, *sinfo 1966 struct sctp_sndrcvinfo _sinfo, *sinfo;
1948 struct sctp_association *asoc, *tmp; 1967 struct sctp_association *asoc, *tmp;
1949 struct sctp_cmsgs cmsgs; 1968 struct sctp_cmsgs cmsgs;
1950 union sctp_addr *daddr; 1969 union sctp_addr *daddr;
1951 bool new = false; 1970 bool new = false;
1952 __u16 sflags; 1971 __u16 sflags;
1953 int err; 1972 int err;
1954 1973
1955 /* Parse and get snd_info */ 1974 /* Parse and get snd_info */
1956 err = sctp_sendmsg_parse(sk, &cmsgs, 1975 err = sctp_sendmsg_parse(sk, &cmsgs, &_sinfo, msg, msg_len);
1957 if (err) 1976 if (err)
1958 goto out; 1977 goto out;
1959 1978
1960 sinfo = &_sinfo; 1979 sinfo = &_sinfo;
1961 sflags = sinfo->sinfo_flags; 1980 sflags = sinfo->sinfo_flags;
1962 1981
1963 /* Get daddr from msg */ 1982 /* Get daddr from msg */
1964 daddr = sctp_sendmsg_get_daddr(sk, ms 1983 daddr = sctp_sendmsg_get_daddr(sk, msg, &cmsgs);
1965 if (IS_ERR(daddr)) { 1984 if (IS_ERR(daddr)) {
1966 err = PTR_ERR(daddr); 1985 err = PTR_ERR(daddr);
1967 goto out; 1986 goto out;
1968 } 1987 }
1969 1988
1970 lock_sock(sk); 1989 lock_sock(sk);
1971 1990
1972 /* SCTP_SENDALL process */ 1991 /* SCTP_SENDALL process */
1973 if ((sflags & SCTP_SENDALL) && sctp_s 1992 if ((sflags & SCTP_SENDALL) && sctp_style(sk, UDP)) {
1974 list_for_each_entry_safe(asoc 1993 list_for_each_entry_safe(asoc, tmp, &ep->asocs, asocs) {
1975 err = sctp_sendmsg_ch 1994 err = sctp_sendmsg_check_sflags(asoc, sflags, msg,
1976 1995 msg_len);
1977 if (err == 0) 1996 if (err == 0)
1978 continue; 1997 continue;
1979 if (err < 0) 1998 if (err < 0)
1980 goto out_unlo 1999 goto out_unlock;
1981 2000
1982 sctp_sendmsg_update_s 2001 sctp_sendmsg_update_sinfo(asoc, sinfo, &cmsgs);
1983 2002
1984 err = sctp_sendmsg_to 2003 err = sctp_sendmsg_to_asoc(asoc, msg, msg_len,
1985 2004 NULL, sinfo);
1986 if (err < 0) 2005 if (err < 0)
1987 goto out_unlo 2006 goto out_unlock;
1988 2007
1989 iov_iter_revert(&msg- 2008 iov_iter_revert(&msg->msg_iter, err);
1990 } 2009 }
1991 2010
1992 goto out_unlock; 2011 goto out_unlock;
1993 } 2012 }
1994 2013
1995 /* Get and check or create asoc */ 2014 /* Get and check or create asoc */
1996 if (daddr) { 2015 if (daddr) {
1997 asoc = sctp_endpoint_lookup_a 2016 asoc = sctp_endpoint_lookup_assoc(ep, daddr, &transport);
1998 if (asoc) { 2017 if (asoc) {
1999 err = sctp_sendmsg_ch 2018 err = sctp_sendmsg_check_sflags(asoc, sflags, msg,
2000 2019 msg_len);
2001 if (err <= 0) 2020 if (err <= 0)
2002 goto out_unlo 2021 goto out_unlock;
2003 } else { 2022 } else {
2004 err = sctp_sendmsg_ne 2023 err = sctp_sendmsg_new_asoc(sk, sflags, &cmsgs, daddr,
2005 2024 &transport);
2006 if (err) 2025 if (err)
2007 goto out_unlo 2026 goto out_unlock;
2008 2027
2009 asoc = transport->aso 2028 asoc = transport->asoc;
2010 new = true; 2029 new = true;
2011 } 2030 }
2012 2031
2013 if (!sctp_style(sk, TCP) && ! 2032 if (!sctp_style(sk, TCP) && !(sflags & SCTP_ADDR_OVER))
2014 transport = NULL; 2033 transport = NULL;
2015 } else { 2034 } else {
2016 asoc = sctp_id2assoc(sk, sinf 2035 asoc = sctp_id2assoc(sk, sinfo->sinfo_assoc_id);
2017 if (!asoc) { 2036 if (!asoc) {
2018 err = -EPIPE; 2037 err = -EPIPE;
2019 goto out_unlock; 2038 goto out_unlock;
2020 } 2039 }
2021 2040
2022 err = sctp_sendmsg_check_sfla 2041 err = sctp_sendmsg_check_sflags(asoc, sflags, msg, msg_len);
2023 if (err <= 0) 2042 if (err <= 0)
2024 goto out_unlock; 2043 goto out_unlock;
2025 } 2044 }
2026 2045
2027 /* Update snd_info with the asoc */ 2046 /* Update snd_info with the asoc */
2028 sctp_sendmsg_update_sinfo(asoc, sinfo 2047 sctp_sendmsg_update_sinfo(asoc, sinfo, &cmsgs);
2029 2048
2030 /* Send msg to the asoc */ 2049 /* Send msg to the asoc */
2031 err = sctp_sendmsg_to_asoc(asoc, msg, 2050 err = sctp_sendmsg_to_asoc(asoc, msg, msg_len, transport, sinfo);
2032 if (err < 0 && err != -ESRCH && new) 2051 if (err < 0 && err != -ESRCH && new)
2033 sctp_association_free(asoc); 2052 sctp_association_free(asoc);
2034 2053
2035 out_unlock: 2054 out_unlock:
2036 release_sock(sk); 2055 release_sock(sk);
2037 out: 2056 out:
2038 return sctp_error(sk, msg->msg_flags, 2057 return sctp_error(sk, msg->msg_flags, err);
2039 } 2058 }
2040 2059
2041 /* This is an extended version of skb_pull() 2060 /* 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 2061 * 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 2062 * frag_list. len specifies the total amount of data that needs to be removed.
2044 * when 'len' bytes could be removed from the 2063 * when 'len' bytes could be removed from the skb, it returns 0.
2045 * If 'len' exceeds the total skb length, it 2064 * If 'len' exceeds the total skb length, it returns the no. of bytes that
2046 * could not be removed. 2065 * could not be removed.
2047 */ 2066 */
2048 static int sctp_skb_pull(struct sk_buff *skb, 2067 static int sctp_skb_pull(struct sk_buff *skb, int len)
2049 { 2068 {
2050 struct sk_buff *list; 2069 struct sk_buff *list;
2051 int skb_len = skb_headlen(skb); 2070 int skb_len = skb_headlen(skb);
2052 int rlen; 2071 int rlen;
2053 2072
2054 if (len <= skb_len) { 2073 if (len <= skb_len) {
2055 __skb_pull(skb, len); 2074 __skb_pull(skb, len);
2056 return 0; 2075 return 0;
2057 } 2076 }
2058 len -= skb_len; 2077 len -= skb_len;
2059 __skb_pull(skb, skb_len); 2078 __skb_pull(skb, skb_len);
2060 2079
2061 skb_walk_frags(skb, list) { 2080 skb_walk_frags(skb, list) {
2062 rlen = sctp_skb_pull(list, le 2081 rlen = sctp_skb_pull(list, len);
2063 skb->len -= (len-rlen); 2082 skb->len -= (len-rlen);
2064 skb->data_len -= (len-rlen); 2083 skb->data_len -= (len-rlen);
2065 2084
2066 if (!rlen) 2085 if (!rlen)
2067 return 0; 2086 return 0;
2068 2087
2069 len = rlen; 2088 len = rlen;
2070 } 2089 }
2071 2090
2072 return len; 2091 return len;
2073 } 2092 }
2074 2093
2075 /* API 3.1.3 recvmsg() - UDP Style Syntax 2094 /* API 3.1.3 recvmsg() - UDP Style Syntax
2076 * 2095 *
2077 * ssize_t recvmsg(int socket, struct msghdr 2096 * ssize_t recvmsg(int socket, struct msghdr *message,
2078 * int flags); 2097 * int flags);
2079 * 2098 *
2080 * socket - the socket descriptor of the en 2099 * socket - the socket descriptor of the endpoint.
2081 * message - pointer to the msghdr structure 2100 * message - pointer to the msghdr structure which contains a single
2082 * user message and possibly some 2101 * user message and possibly some ancillary data.
2083 * 2102 *
2084 * See Section 5 for complete desc 2103 * See Section 5 for complete description of the data
2085 * structures. 2104 * structures.
2086 * 2105 *
2087 * flags - flags sent or received with the 2106 * flags - flags sent or received with the user message, see Section
2088 * 5 for complete description of t 2107 * 5 for complete description of the flags.
2089 */ 2108 */
2090 static int sctp_recvmsg(struct sock *sk, stru 2109 static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
2091 int flags, int *addr_ !! 2110 int noblock, int flags, int *addr_len)
2092 { 2111 {
2093 struct sctp_ulpevent *event = NULL; 2112 struct sctp_ulpevent *event = NULL;
2094 struct sctp_sock *sp = sctp_sk(sk); 2113 struct sctp_sock *sp = sctp_sk(sk);
2095 struct sk_buff *skb, *head_skb; 2114 struct sk_buff *skb, *head_skb;
2096 int copied; 2115 int copied;
2097 int err = 0; 2116 int err = 0;
2098 int skb_len; 2117 int skb_len;
2099 2118
2100 pr_debug("%s: sk:%p, msghdr:%p, len:% !! 2119 pr_debug("%s: sk:%p, msghdr:%p, len:%zd, noblock:%d, flags:0x%x, "
2101 __func__, sk, msg, len, flag !! 2120 "addr_len:%p)\n", __func__, sk, msg, len, noblock, flags,
2102 !! 2121 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 2122
2110 lock_sock(sk); 2123 lock_sock(sk);
2111 2124
2112 if (sctp_style(sk, TCP) && !sctp_ssta 2125 if (sctp_style(sk, TCP) && !sctp_sstate(sk, ESTABLISHED) &&
2113 !sctp_sstate(sk, CLOSING) && !sct 2126 !sctp_sstate(sk, CLOSING) && !sctp_sstate(sk, CLOSED)) {
2114 err = -ENOTCONN; 2127 err = -ENOTCONN;
2115 goto out; 2128 goto out;
2116 } 2129 }
2117 2130
2118 skb = sctp_skb_recv_datagram(sk, flag !! 2131 skb = sctp_skb_recv_datagram(sk, flags, noblock, &err);
2119 if (!skb) 2132 if (!skb)
2120 goto out; 2133 goto out;
2121 2134
2122 /* Get the total length of the skb in 2135 /* Get the total length of the skb including any skb's in the
2123 * frag_list. 2136 * frag_list.
2124 */ 2137 */
2125 skb_len = skb->len; 2138 skb_len = skb->len;
2126 2139
2127 copied = skb_len; 2140 copied = skb_len;
2128 if (copied > len) 2141 if (copied > len)
2129 copied = len; 2142 copied = len;
2130 2143
2131 err = skb_copy_datagram_msg(skb, 0, m 2144 err = skb_copy_datagram_msg(skb, 0, msg, copied);
2132 2145
2133 event = sctp_skb2event(skb); 2146 event = sctp_skb2event(skb);
2134 2147
2135 if (err) 2148 if (err)
2136 goto out_free; 2149 goto out_free;
2137 2150
2138 if (event->chunk && event->chunk->hea 2151 if (event->chunk && event->chunk->head_skb)
2139 head_skb = event->chunk->head 2152 head_skb = event->chunk->head_skb;
2140 else 2153 else
2141 head_skb = skb; 2154 head_skb = skb;
2142 sock_recv_cmsgs(msg, sk, head_skb); !! 2155 sock_recv_ts_and_drops(msg, sk, head_skb);
2143 if (sctp_ulpevent_is_notification(eve 2156 if (sctp_ulpevent_is_notification(event)) {
2144 msg->msg_flags |= MSG_NOTIFIC 2157 msg->msg_flags |= MSG_NOTIFICATION;
2145 sp->pf->event_msgname(event, 2158 sp->pf->event_msgname(event, msg->msg_name, addr_len);
2146 } else { 2159 } else {
2147 sp->pf->skb_msgname(head_skb, 2160 sp->pf->skb_msgname(head_skb, msg->msg_name, addr_len);
2148 } 2161 }
2149 2162
2150 /* Check if we allow SCTP_NXTINFO. */ 2163 /* Check if we allow SCTP_NXTINFO. */
2151 if (sp->recvnxtinfo) 2164 if (sp->recvnxtinfo)
2152 sctp_ulpevent_read_nxtinfo(ev 2165 sctp_ulpevent_read_nxtinfo(event, msg, sk);
2153 /* Check if we allow SCTP_RCVINFO. */ 2166 /* Check if we allow SCTP_RCVINFO. */
2154 if (sp->recvrcvinfo) 2167 if (sp->recvrcvinfo)
2155 sctp_ulpevent_read_rcvinfo(ev 2168 sctp_ulpevent_read_rcvinfo(event, msg);
2156 /* Check if we allow SCTP_SNDRCVINFO. 2169 /* Check if we allow SCTP_SNDRCVINFO. */
2157 if (sctp_ulpevent_type_enabled(sp->su 2170 if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_DATA_IO_EVENT))
2158 sctp_ulpevent_read_sndrcvinfo 2171 sctp_ulpevent_read_sndrcvinfo(event, msg);
2159 2172
2160 err = copied; 2173 err = copied;
2161 2174
2162 /* If skb's length exceeds the user's 2175 /* If skb's length exceeds the user's buffer, update the skb and
2163 * push it back to the receive_queue 2176 * push it back to the receive_queue so that the next call to
2164 * recvmsg() will return the remainin 2177 * recvmsg() will return the remaining data. Don't set MSG_EOR.
2165 */ 2178 */
2166 if (skb_len > copied) { 2179 if (skb_len > copied) {
2167 msg->msg_flags &= ~MSG_EOR; 2180 msg->msg_flags &= ~MSG_EOR;
2168 if (flags & MSG_PEEK) 2181 if (flags & MSG_PEEK)
2169 goto out_free; 2182 goto out_free;
2170 sctp_skb_pull(skb, copied); 2183 sctp_skb_pull(skb, copied);
2171 skb_queue_head(&sk->sk_receiv 2184 skb_queue_head(&sk->sk_receive_queue, skb);
2172 2185
2173 /* When only partial message 2186 /* When only partial message is copied to the user, increase
2174 * rwnd by that amount. If al 2187 * rwnd by that amount. If all the data in the skb is read,
2175 * rwnd is updated when the e 2188 * rwnd is updated when the event is freed.
2176 */ 2189 */
2177 if (!sctp_ulpevent_is_notific 2190 if (!sctp_ulpevent_is_notification(event))
2178 sctp_assoc_rwnd_incre 2191 sctp_assoc_rwnd_increase(event->asoc, copied);
2179 goto out; 2192 goto out;
2180 } else if ((event->msg_flags & MSG_NO 2193 } else if ((event->msg_flags & MSG_NOTIFICATION) ||
2181 (event->msg_flags & MSG_EO 2194 (event->msg_flags & MSG_EOR))
2182 msg->msg_flags |= MSG_EOR; 2195 msg->msg_flags |= MSG_EOR;
2183 else 2196 else
2184 msg->msg_flags &= ~MSG_EOR; 2197 msg->msg_flags &= ~MSG_EOR;
2185 2198
2186 out_free: 2199 out_free:
2187 if (flags & MSG_PEEK) { 2200 if (flags & MSG_PEEK) {
2188 /* Release the skb reference 2201 /* Release the skb reference acquired after peeking the skb in
2189 * sctp_skb_recv_datagram(). 2202 * sctp_skb_recv_datagram().
2190 */ 2203 */
2191 kfree_skb(skb); 2204 kfree_skb(skb);
2192 } else { 2205 } else {
2193 /* Free the event which inclu 2206 /* Free the event which includes releasing the reference to
2194 * the owner of the skb, free 2207 * the owner of the skb, freeing the skb and updating the
2195 * rwnd. 2208 * rwnd.
2196 */ 2209 */
2197 sctp_ulpevent_free(event); 2210 sctp_ulpevent_free(event);
2198 } 2211 }
2199 out: 2212 out:
2200 release_sock(sk); 2213 release_sock(sk);
2201 return err; 2214 return err;
2202 } 2215 }
2203 2216
2204 /* 7.1.12 Enable/Disable message fragmentatio 2217 /* 7.1.12 Enable/Disable message fragmentation (SCTP_DISABLE_FRAGMENTS)
2205 * 2218 *
2206 * This option is a on/off flag. If enabled 2219 * This option is a on/off flag. If enabled no SCTP message
2207 * fragmentation will be performed. Instead 2220 * fragmentation will be performed. Instead if a message being sent
2208 * exceeds the current PMTU size, the message 2221 * exceeds the current PMTU size, the message will NOT be sent and
2209 * instead a error will be indicated to the u 2222 * instead a error will be indicated to the user.
2210 */ 2223 */
2211 static int sctp_setsockopt_disable_fragments( !! 2224 static int sctp_setsockopt_disable_fragments(struct sock *sk,
>> 2225 char __user *optval,
2212 2226 unsigned int optlen)
2213 { 2227 {
>> 2228 int val;
>> 2229
2214 if (optlen < sizeof(int)) 2230 if (optlen < sizeof(int))
2215 return -EINVAL; 2231 return -EINVAL;
2216 sctp_sk(sk)->disable_fragments = (*va !! 2232
>> 2233 if (get_user(val, (int __user *)optval))
>> 2234 return -EFAULT;
>> 2235
>> 2236 sctp_sk(sk)->disable_fragments = (val == 0) ? 0 : 1;
>> 2237
2217 return 0; 2238 return 0;
2218 } 2239 }
2219 2240
2220 static int sctp_setsockopt_events(struct sock !! 2241 static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
2221 unsigned in 2242 unsigned int optlen)
2222 { 2243 {
>> 2244 struct sctp_event_subscribe subscribe;
>> 2245 __u8 *sn_type = (__u8 *)&subscribe;
2223 struct sctp_sock *sp = sctp_sk(sk); 2246 struct sctp_sock *sp = sctp_sk(sk);
2224 struct sctp_association *asoc; 2247 struct sctp_association *asoc;
2225 int i; 2248 int i;
2226 2249
2227 if (optlen > sizeof(struct sctp_event 2250 if (optlen > sizeof(struct sctp_event_subscribe))
2228 return -EINVAL; 2251 return -EINVAL;
2229 2252
>> 2253 if (copy_from_user(&subscribe, optval, optlen))
>> 2254 return -EFAULT;
>> 2255
2230 for (i = 0; i < optlen; i++) 2256 for (i = 0; i < optlen; i++)
2231 sctp_ulpevent_type_set(&sp->s 2257 sctp_ulpevent_type_set(&sp->subscribe, SCTP_SN_TYPE_BASE + i,
2232 sn_typ 2258 sn_type[i]);
2233 2259
2234 list_for_each_entry(asoc, &sp->ep->as 2260 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
2235 asoc->subscribe = sctp_sk(sk) 2261 asoc->subscribe = sctp_sk(sk)->subscribe;
2236 2262
2237 /* At the time when a user app subscr 2263 /* At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
2238 * if there is no data to be sent or 2264 * if there is no data to be sent or retransmit, the stack will
2239 * immediately send up this notificat 2265 * immediately send up this notification.
2240 */ 2266 */
2241 if (sctp_ulpevent_type_enabled(sp->su 2267 if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_SENDER_DRY_EVENT)) {
2242 struct sctp_ulpevent *event; 2268 struct sctp_ulpevent *event;
2243 2269
2244 asoc = sctp_id2assoc(sk, 0); 2270 asoc = sctp_id2assoc(sk, 0);
2245 if (asoc && sctp_outq_is_empt 2271 if (asoc && sctp_outq_is_empty(&asoc->outqueue)) {
2246 event = sctp_ulpevent 2272 event = sctp_ulpevent_make_sender_dry_event(asoc,
2247 GFP_U 2273 GFP_USER | __GFP_NOWARN);
2248 if (!event) 2274 if (!event)
2249 return -ENOME 2275 return -ENOMEM;
2250 2276
2251 asoc->stream.si->enqu 2277 asoc->stream.si->enqueue_event(&asoc->ulpq, event);
2252 } 2278 }
2253 } 2279 }
2254 2280
2255 return 0; 2281 return 0;
2256 } 2282 }
2257 2283
2258 /* 7.1.8 Automatic Close of associations (SCT 2284 /* 7.1.8 Automatic Close of associations (SCTP_AUTOCLOSE)
2259 * 2285 *
2260 * This socket option is applicable to the UD 2286 * This socket option is applicable to the UDP-style socket only. When
2261 * set it will cause associations that are id 2287 * set it will cause associations that are idle for more than the
2262 * specified number of seconds to automatical 2288 * specified number of seconds to automatically close. An association
2263 * being idle is defined an association that 2289 * being idle is defined an association that has NOT sent or received
2264 * user data. The special value of '' indica 2290 * user data. The special value of '' indicates that no automatic
2265 * close of any associations should be perfor 2291 * close of any associations should be performed. The option expects an
2266 * integer defining the number of seconds of 2292 * integer defining the number of seconds of idle time before an
2267 * association is closed. 2293 * association is closed.
2268 */ 2294 */
2269 static int sctp_setsockopt_autoclose(struct s !! 2295 static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
2270 unsigned 2296 unsigned int optlen)
2271 { 2297 {
2272 struct sctp_sock *sp = sctp_sk(sk); 2298 struct sctp_sock *sp = sctp_sk(sk);
2273 struct net *net = sock_net(sk); 2299 struct net *net = sock_net(sk);
2274 2300
2275 /* Applicable to UDP-style socket onl 2301 /* Applicable to UDP-style socket only */
2276 if (sctp_style(sk, TCP)) 2302 if (sctp_style(sk, TCP))
2277 return -EOPNOTSUPP; 2303 return -EOPNOTSUPP;
2278 if (optlen != sizeof(int)) 2304 if (optlen != sizeof(int))
2279 return -EINVAL; 2305 return -EINVAL;
>> 2306 if (copy_from_user(&sp->autoclose, optval, optlen))
>> 2307 return -EFAULT;
2280 2308
2281 sp->autoclose = *optval; <<
2282 if (sp->autoclose > net->sctp.max_aut 2309 if (sp->autoclose > net->sctp.max_autoclose)
2283 sp->autoclose = net->sctp.max 2310 sp->autoclose = net->sctp.max_autoclose;
2284 2311
2285 return 0; 2312 return 0;
2286 } 2313 }
2287 2314
2288 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ 2315 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ADDR_PARAMS)
2289 * 2316 *
2290 * Applications can enable or disable heartbe 2317 * Applications can enable or disable heartbeats for any peer address of
2291 * an association, modify an address's heartb 2318 * an association, modify an address's heartbeat interval, force a
2292 * heartbeat to be sent immediately, and adju 2319 * heartbeat to be sent immediately, and adjust the address's maximum
2293 * number of retransmissions sent before an a 2320 * number of retransmissions sent before an address is considered
2294 * unreachable. The following structure is u 2321 * unreachable. The following structure is used to access and modify an
2295 * address's parameters: 2322 * address's parameters:
2296 * 2323 *
2297 * struct sctp_paddrparams { 2324 * struct sctp_paddrparams {
2298 * sctp_assoc_t spp_assoc_id; 2325 * sctp_assoc_t spp_assoc_id;
2299 * struct sockaddr_storage spp_address; 2326 * struct sockaddr_storage spp_address;
2300 * uint32_t spp_hbinterval 2327 * uint32_t spp_hbinterval;
2301 * uint16_t spp_pathmaxrxt 2328 * uint16_t spp_pathmaxrxt;
2302 * uint32_t spp_pathmtu; 2329 * uint32_t spp_pathmtu;
2303 * uint32_t spp_sackdelay; 2330 * uint32_t spp_sackdelay;
2304 * uint32_t spp_flags; 2331 * uint32_t spp_flags;
2305 * uint32_t spp_ipv6_flowl 2332 * uint32_t spp_ipv6_flowlabel;
2306 * uint8_t spp_dscp; 2333 * uint8_t spp_dscp;
2307 * }; 2334 * };
2308 * 2335 *
2309 * spp_assoc_id - (one-to-many style soc 2336 * spp_assoc_id - (one-to-many style socket) This is filled in the
2310 * application, and ident 2337 * application, and identifies the association for
2311 * this query. 2338 * this query.
2312 * spp_address - This specifies which a 2339 * spp_address - This specifies which address is of interest.
2313 * spp_hbinterval - This contains the valu 2340 * spp_hbinterval - This contains the value of the heartbeat interval,
2314 * in milliseconds. If a 2341 * in milliseconds. If a value of zero
2315 * is present in this fie 2342 * is present in this field then no changes are to
2316 * be made to this parame 2343 * be made to this parameter.
2317 * spp_pathmaxrxt - This contains the maxi 2344 * spp_pathmaxrxt - This contains the maximum number of
2318 * retransmissions before 2345 * retransmissions before this address shall be
2319 * considered unreachable 2346 * considered unreachable. If a value of zero
2320 * is present in this fie 2347 * is present in this field then no changes are to
2321 * be made to this parame 2348 * be made to this parameter.
2322 * spp_pathmtu - When Path MTU discover 2349 * spp_pathmtu - When Path MTU discovery is disabled the value
2323 * specified here will be 2350 * specified here will be the "fixed" path mtu.
2324 * Note that if the spp_a 2351 * Note that if the spp_address field is empty
2325 * then all associations 2352 * then all associations on this address will
2326 * have this fixed path m 2353 * have this fixed path mtu set upon them.
2327 * 2354 *
2328 * spp_sackdelay - When delayed sack is e 2355 * spp_sackdelay - When delayed sack is enabled, this value specifies
2329 * the number of millisec 2356 * the number of milliseconds that sacks will be delayed
2330 * for. This value will a 2357 * for. This value will apply to all addresses of an
2331 * association if the spp 2358 * association if the spp_address field is empty. Note
2332 * also, that if delayed 2359 * also, that if delayed sack is enabled and this
2333 * value is set to 0, no 2360 * value is set to 0, no change is made to the last
2334 * recorded delayed sack 2361 * recorded delayed sack timer value.
2335 * 2362 *
2336 * spp_flags - These flags are used t 2363 * spp_flags - These flags are used to control various features
2337 * on an association. The 2364 * on an association. The flag field may contain
2338 * zero or more of the fo 2365 * zero or more of the following options.
2339 * 2366 *
2340 * SPP_HB_ENABLE - Enabl 2367 * SPP_HB_ENABLE - Enable heartbeats on the
2341 * specified address. Not 2368 * specified address. Note that if the address
2342 * field is empty all add 2369 * field is empty all addresses for the association
2343 * have heartbeats enable 2370 * have heartbeats enabled upon them.
2344 * 2371 *
2345 * SPP_HB_DISABLE - Disab 2372 * SPP_HB_DISABLE - Disable heartbeats on the
2346 * speicifed address. Not 2373 * speicifed address. Note that if the address
2347 * field is empty all add 2374 * field is empty all addresses for the association
2348 * will have their heartb 2375 * will have their heartbeats disabled. Note also
2349 * that SPP_HB_ENABLE and 2376 * that SPP_HB_ENABLE and SPP_HB_DISABLE are
2350 * mutually exclusive, on 2377 * mutually exclusive, only one of these two should
2351 * be specified. Enabling 2378 * be specified. Enabling both fields will have
2352 * undetermined results. 2379 * undetermined results.
2353 * 2380 *
2354 * SPP_HB_DEMAND - Reques 2381 * SPP_HB_DEMAND - Request a user initiated heartbeat
2355 * to be made immediately 2382 * to be made immediately.
2356 * 2383 *
2357 * SPP_HB_TIME_IS_ZERO - 2384 * SPP_HB_TIME_IS_ZERO - Specify's that the time for
2358 * heartbeat delayis to b 2385 * heartbeat delayis to be set to the value of 0
2359 * milliseconds. 2386 * milliseconds.
2360 * 2387 *
2361 * SPP_PMTUD_ENABLE - Thi 2388 * SPP_PMTUD_ENABLE - This field will enable PMTU
2362 * discovery upon the spe 2389 * discovery upon the specified address. Note that
2363 * if the address feild i 2390 * if the address feild is empty then all addresses
2364 * on the association are 2391 * on the association are effected.
2365 * 2392 *
2366 * SPP_PMTUD_DISABLE - Th 2393 * SPP_PMTUD_DISABLE - This field will disable PMTU
2367 * discovery upon the spe 2394 * discovery upon the specified address. Note that
2368 * if the address feild i 2395 * if the address feild is empty then all addresses
2369 * on the association are 2396 * on the association are effected. Not also that
2370 * SPP_PMTUD_ENABLE and S 2397 * SPP_PMTUD_ENABLE and SPP_PMTUD_DISABLE are mutually
2371 * exclusive. Enabling bo 2398 * exclusive. Enabling both will have undetermined
2372 * results. 2399 * results.
2373 * 2400 *
2374 * SPP_SACKDELAY_ENABLE - 2401 * SPP_SACKDELAY_ENABLE - Setting this flag turns
2375 * on delayed sack. The t 2402 * on delayed sack. The time specified in spp_sackdelay
2376 * is used to specify the 2403 * is used to specify the sack delay for this address. Note
2377 * that if spp_address is 2404 * that if spp_address is empty then all addresses will
2378 * enable delayed sack an 2405 * enable delayed sack and take on the sack delay
2379 * value specified in spp 2406 * value specified in spp_sackdelay.
2380 * SPP_SACKDELAY_DISABLE 2407 * SPP_SACKDELAY_DISABLE - Setting this flag turns
2381 * off delayed sack. If t 2408 * off delayed sack. If the spp_address field is blank then
2382 * delayed sack is disabl 2409 * delayed sack is disabled for the entire association. Note
2383 * also that this field i 2410 * also that this field is mutually exclusive to
2384 * SPP_SACKDELAY_ENABLE, 2411 * SPP_SACKDELAY_ENABLE, setting both will have undefined
2385 * results. 2412 * results.
2386 * 2413 *
2387 * SPP_IPV6_FLOWLABEL: S 2414 * SPP_IPV6_FLOWLABEL: Setting this flag enables the
2388 * setting of the IPV6 fl 2415 * setting of the IPV6 flow label value. The value is
2389 * contained in the spp_i 2416 * contained in the spp_ipv6_flowlabel field.
2390 * Upon retrieval, this f 2417 * Upon retrieval, this flag will be set to indicate that
2391 * the spp_ipv6_flowlabel 2418 * the spp_ipv6_flowlabel field has a valid value returned.
2392 * If a specific destinat 2419 * If a specific destination address is set (in the
2393 * spp_address field), th 2420 * spp_address field), then the value returned is that of
2394 * the address. If just 2421 * the address. If just an association is specified (and
2395 * no address), then the 2422 * no address), then the association's default flow label
2396 * is returned. If neith 2423 * is returned. If neither an association nor a destination
2397 * is specified, then the 2424 * is specified, then the socket's default flow label is
2398 * returned. For non-IPv 2425 * returned. For non-IPv6 sockets, this flag will be left
2399 * cleared. 2426 * cleared.
2400 * 2427 *
2401 * SPP_DSCP: Setting thi 2428 * SPP_DSCP: Setting this flag enables the setting of the
2402 * Differentiated Service 2429 * Differentiated Services Code Point (DSCP) value
2403 * associated with either 2430 * associated with either the association or a specific
2404 * address. The value is 2431 * address. The value is obtained in the spp_dscp field.
2405 * Upon retrieval, this f 2432 * Upon retrieval, this flag will be set to indicate that
2406 * the spp_dscp field has 2433 * the spp_dscp field has a valid value returned. If a
2407 * specific destination a 2434 * specific destination address is set when called (in the
2408 * spp_address field), th 2435 * spp_address field), then that specific destination
2409 * address's DSCP value i 2436 * address's DSCP value is returned. If just an association
2410 * is specified, then the 2437 * is specified, then the association's default DSCP is
2411 * returned. If neither 2438 * returned. If neither an association nor a destination is
2412 * specified, then the so 2439 * specified, then the socket's default DSCP is returned.
2413 * 2440 *
2414 * spp_ipv6_flowlabel 2441 * spp_ipv6_flowlabel
2415 * - This field is used in 2442 * - This field is used in conjunction with the
2416 * SPP_IPV6_FLOWLABEL fla 2443 * SPP_IPV6_FLOWLABEL flag and contains the IPv6 flow label.
2417 * The 20 least significa 2444 * The 20 least significant bits are used for the flow
2418 * label. This setting h 2445 * label. This setting has precedence over any IPv6-layer
2419 * setting. 2446 * setting.
2420 * 2447 *
2421 * spp_dscp - This field is used in 2448 * spp_dscp - This field is used in conjunction with the SPP_DSCP flag
2422 * and contains the DSCP. 2449 * and contains the DSCP. The 6 most significant bits are
2423 * used for the DSCP. Th 2450 * used for the DSCP. This setting has precedence over any
2424 * IPv4- or IPv6- layer s 2451 * IPv4- or IPv6- layer setting.
2425 */ 2452 */
2426 static int sctp_apply_peer_addr_params(struct 2453 static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
2427 struct 2454 struct sctp_transport *trans,
2428 struct 2455 struct sctp_association *asoc,
2429 struct 2456 struct sctp_sock *sp,
2430 int 2457 int hb_change,
2431 int 2458 int pmtud_change,
2432 int 2459 int sackdelay_change)
2433 { 2460 {
2434 int error; 2461 int error;
2435 2462
2436 if (params->spp_flags & SPP_HB_DEMAND 2463 if (params->spp_flags & SPP_HB_DEMAND && trans) {
2437 error = sctp_primitive_REQUES !! 2464 struct net *net = sock_net(trans->asoc->base.sk);
2438 !! 2465
>> 2466 error = sctp_primitive_REQUESTHEARTBEAT(net, trans->asoc, trans);
2439 if (error) 2467 if (error)
2440 return error; 2468 return error;
2441 } 2469 }
2442 2470
2443 /* Note that unless the spp_flag is s 2471 /* Note that unless the spp_flag is set to SPP_HB_ENABLE the value of
2444 * this field is ignored. Note also 2472 * this field is ignored. Note also that a value of zero indicates
2445 * the current setting should be left 2473 * the current setting should be left unchanged.
2446 */ 2474 */
2447 if (params->spp_flags & SPP_HB_ENABLE 2475 if (params->spp_flags & SPP_HB_ENABLE) {
2448 2476
2449 /* Re-zero the interval if th 2477 /* Re-zero the interval if the SPP_HB_TIME_IS_ZERO is
2450 * set. This lets us use 0 v 2478 * set. This lets us use 0 value when this flag
2451 * is set. 2479 * is set.
2452 */ 2480 */
2453 if (params->spp_flags & SPP_H 2481 if (params->spp_flags & SPP_HB_TIME_IS_ZERO)
2454 params->spp_hbinterva 2482 params->spp_hbinterval = 0;
2455 2483
2456 if (params->spp_hbinterval || 2484 if (params->spp_hbinterval ||
2457 (params->spp_flags & SPP_ 2485 (params->spp_flags & SPP_HB_TIME_IS_ZERO)) {
2458 if (trans) { 2486 if (trans) {
2459 trans->hbinte 2487 trans->hbinterval =
2460 msecs_to_ 2488 msecs_to_jiffies(params->spp_hbinterval);
2461 sctp_transpor 2489 sctp_transport_reset_hb_timer(trans);
2462 } else if (asoc) { 2490 } else if (asoc) {
2463 asoc->hbinter 2491 asoc->hbinterval =
2464 msecs_to_ 2492 msecs_to_jiffies(params->spp_hbinterval);
2465 } else { 2493 } else {
2466 sp->hbinterva 2494 sp->hbinterval = params->spp_hbinterval;
2467 } 2495 }
2468 } 2496 }
2469 } 2497 }
2470 2498
2471 if (hb_change) { 2499 if (hb_change) {
2472 if (trans) { 2500 if (trans) {
2473 trans->param_flags = 2501 trans->param_flags =
2474 (trans->param 2502 (trans->param_flags & ~SPP_HB) | hb_change;
2475 } else if (asoc) { 2503 } else if (asoc) {
2476 asoc->param_flags = 2504 asoc->param_flags =
2477 (asoc->param_ 2505 (asoc->param_flags & ~SPP_HB) | hb_change;
2478 } else { 2506 } else {
2479 sp->param_flags = 2507 sp->param_flags =
2480 (sp->param_fl 2508 (sp->param_flags & ~SPP_HB) | hb_change;
2481 } 2509 }
2482 } 2510 }
2483 2511
2484 /* When Path MTU discovery is disable 2512 /* When Path MTU discovery is disabled the value specified here will
2485 * be the "fixed" path mtu (i.e. the 2513 * be the "fixed" path mtu (i.e. the value of the spp_flags field must
2486 * include the flag SPP_PMTUD_DISABLE 2514 * include the flag SPP_PMTUD_DISABLE for this field to have any
2487 * effect). 2515 * effect).
2488 */ 2516 */
2489 if ((params->spp_flags & SPP_PMTUD_DI 2517 if ((params->spp_flags & SPP_PMTUD_DISABLE) && params->spp_pathmtu) {
2490 if (trans) { 2518 if (trans) {
2491 trans->pathmtu = para 2519 trans->pathmtu = params->spp_pathmtu;
2492 sctp_assoc_sync_pmtu( 2520 sctp_assoc_sync_pmtu(asoc);
2493 } else if (asoc) { 2521 } else if (asoc) {
2494 sctp_assoc_set_pmtu(a 2522 sctp_assoc_set_pmtu(asoc, params->spp_pathmtu);
2495 } else { 2523 } else {
2496 sp->pathmtu = params- 2524 sp->pathmtu = params->spp_pathmtu;
2497 } 2525 }
2498 } 2526 }
2499 2527
2500 if (pmtud_change) { 2528 if (pmtud_change) {
2501 if (trans) { 2529 if (trans) {
2502 int update = (trans-> 2530 int update = (trans->param_flags & SPP_PMTUD_DISABLE) &&
2503 (params->spp_ 2531 (params->spp_flags & SPP_PMTUD_ENABLE);
2504 trans->param_flags = 2532 trans->param_flags =
2505 (trans->param 2533 (trans->param_flags & ~SPP_PMTUD) | pmtud_change;
2506 if (update) { 2534 if (update) {
2507 sctp_transpor 2535 sctp_transport_pmtu(trans, sctp_opt2sk(sp));
2508 sctp_assoc_sy 2536 sctp_assoc_sync_pmtu(asoc);
2509 } 2537 }
2510 sctp_transport_pl_res <<
2511 } else if (asoc) { 2538 } else if (asoc) {
2512 asoc->param_flags = 2539 asoc->param_flags =
2513 (asoc->param_ 2540 (asoc->param_flags & ~SPP_PMTUD) | pmtud_change;
2514 } else { 2541 } else {
2515 sp->param_flags = 2542 sp->param_flags =
2516 (sp->param_fl 2543 (sp->param_flags & ~SPP_PMTUD) | pmtud_change;
2517 } 2544 }
2518 } 2545 }
2519 2546
2520 /* Note that unless the spp_flag is s 2547 /* Note that unless the spp_flag is set to SPP_SACKDELAY_ENABLE the
2521 * value of this field is ignored. N 2548 * value of this field is ignored. Note also that a value of zero
2522 * indicates the current setting shou 2549 * indicates the current setting should be left unchanged.
2523 */ 2550 */
2524 if ((params->spp_flags & SPP_SACKDELA 2551 if ((params->spp_flags & SPP_SACKDELAY_ENABLE) && params->spp_sackdelay) {
2525 if (trans) { 2552 if (trans) {
2526 trans->sackdelay = 2553 trans->sackdelay =
2527 msecs_to_jiff 2554 msecs_to_jiffies(params->spp_sackdelay);
2528 } else if (asoc) { 2555 } else if (asoc) {
2529 asoc->sackdelay = 2556 asoc->sackdelay =
2530 msecs_to_jiff 2557 msecs_to_jiffies(params->spp_sackdelay);
2531 } else { 2558 } else {
2532 sp->sackdelay = param 2559 sp->sackdelay = params->spp_sackdelay;
2533 } 2560 }
2534 } 2561 }
2535 2562
2536 if (sackdelay_change) { 2563 if (sackdelay_change) {
2537 if (trans) { 2564 if (trans) {
2538 trans->param_flags = 2565 trans->param_flags =
2539 (trans->param 2566 (trans->param_flags & ~SPP_SACKDELAY) |
2540 sackdelay_cha 2567 sackdelay_change;
2541 } else if (asoc) { 2568 } else if (asoc) {
2542 asoc->param_flags = 2569 asoc->param_flags =
2543 (asoc->param_ 2570 (asoc->param_flags & ~SPP_SACKDELAY) |
2544 sackdelay_cha 2571 sackdelay_change;
2545 } else { 2572 } else {
2546 sp->param_flags = 2573 sp->param_flags =
2547 (sp->param_fl 2574 (sp->param_flags & ~SPP_SACKDELAY) |
2548 sackdelay_cha 2575 sackdelay_change;
2549 } 2576 }
2550 } 2577 }
2551 2578
2552 /* Note that a value of zero indicate 2579 /* Note that a value of zero indicates the current setting should be
2553 left unchanged. 2580 left unchanged.
2554 */ 2581 */
2555 if (params->spp_pathmaxrxt) { 2582 if (params->spp_pathmaxrxt) {
2556 if (trans) { 2583 if (trans) {
2557 trans->pathmaxrxt = p 2584 trans->pathmaxrxt = params->spp_pathmaxrxt;
2558 } else if (asoc) { 2585 } else if (asoc) {
2559 asoc->pathmaxrxt = pa 2586 asoc->pathmaxrxt = params->spp_pathmaxrxt;
2560 } else { 2587 } else {
2561 sp->pathmaxrxt = para 2588 sp->pathmaxrxt = params->spp_pathmaxrxt;
2562 } 2589 }
2563 } 2590 }
2564 2591
2565 if (params->spp_flags & SPP_IPV6_FLOW 2592 if (params->spp_flags & SPP_IPV6_FLOWLABEL) {
2566 if (trans) { 2593 if (trans) {
2567 if (trans->ipaddr.sa. 2594 if (trans->ipaddr.sa.sa_family == AF_INET6) {
2568 trans->flowla 2595 trans->flowlabel = params->spp_ipv6_flowlabel &
2569 2596 SCTP_FLOWLABEL_VAL_MASK;
2570 trans->flowla 2597 trans->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2571 } 2598 }
2572 } else if (asoc) { 2599 } else if (asoc) {
2573 struct sctp_transport 2600 struct sctp_transport *t;
2574 2601
2575 list_for_each_entry(t 2602 list_for_each_entry(t, &asoc->peer.transport_addr_list,
2576 t 2603 transports) {
2577 if (t->ipaddr 2604 if (t->ipaddr.sa.sa_family != AF_INET6)
2578 conti 2605 continue;
2579 t->flowlabel 2606 t->flowlabel = params->spp_ipv6_flowlabel &
2580 2607 SCTP_FLOWLABEL_VAL_MASK;
2581 t->flowlabel 2608 t->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2582 } 2609 }
2583 asoc->flowlabel = par 2610 asoc->flowlabel = params->spp_ipv6_flowlabel &
2584 SCT 2611 SCTP_FLOWLABEL_VAL_MASK;
2585 asoc->flowlabel |= SC 2612 asoc->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2586 } else if (sctp_opt2sk(sp)->s 2613 } else if (sctp_opt2sk(sp)->sk_family == AF_INET6) {
2587 sp->flowlabel = param 2614 sp->flowlabel = params->spp_ipv6_flowlabel &
2588 SCTP_ 2615 SCTP_FLOWLABEL_VAL_MASK;
2589 sp->flowlabel |= SCTP 2616 sp->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
2590 } 2617 }
2591 } 2618 }
2592 2619
2593 if (params->spp_flags & SPP_DSCP) { 2620 if (params->spp_flags & SPP_DSCP) {
2594 if (trans) { 2621 if (trans) {
2595 trans->dscp = params- 2622 trans->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2596 trans->dscp |= SCTP_D 2623 trans->dscp |= SCTP_DSCP_SET_MASK;
2597 } else if (asoc) { 2624 } else if (asoc) {
2598 struct sctp_transport 2625 struct sctp_transport *t;
2599 2626
2600 list_for_each_entry(t 2627 list_for_each_entry(t, &asoc->peer.transport_addr_list,
2601 t 2628 transports) {
2602 t->dscp = par 2629 t->dscp = params->spp_dscp &
2603 SCT 2630 SCTP_DSCP_VAL_MASK;
2604 t->dscp |= SC 2631 t->dscp |= SCTP_DSCP_SET_MASK;
2605 } 2632 }
2606 asoc->dscp = params-> 2633 asoc->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2607 asoc->dscp |= SCTP_DS 2634 asoc->dscp |= SCTP_DSCP_SET_MASK;
2608 } else { 2635 } else {
2609 sp->dscp = params->sp 2636 sp->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
2610 sp->dscp |= SCTP_DSCP 2637 sp->dscp |= SCTP_DSCP_SET_MASK;
2611 } 2638 }
2612 } 2639 }
2613 2640
2614 return 0; 2641 return 0;
2615 } 2642 }
2616 2643
2617 static int sctp_setsockopt_peer_addr_params(s 2644 static int sctp_setsockopt_peer_addr_params(struct sock *sk,
2618 s !! 2645 char __user *optval,
2619 u 2646 unsigned int optlen)
2620 { 2647 {
>> 2648 struct sctp_paddrparams params;
2621 struct sctp_transport *trans = NULL 2649 struct sctp_transport *trans = NULL;
2622 struct sctp_association *asoc = NULL; 2650 struct sctp_association *asoc = NULL;
2623 struct sctp_sock *sp = sctp_sk 2651 struct sctp_sock *sp = sctp_sk(sk);
2624 int error; 2652 int error;
2625 int hb_change, pmtud_change, sackdela 2653 int hb_change, pmtud_change, sackdelay_change;
2626 2654
2627 if (optlen == ALIGN(offsetof(struct s !! 2655 if (optlen == sizeof(params)) {
>> 2656 if (copy_from_user(¶ms, optval, optlen))
>> 2657 return -EFAULT;
>> 2658 } else if (optlen == ALIGN(offsetof(struct sctp_paddrparams,
2628 s 2659 spp_ipv6_flowlabel), 4)) {
2629 if (params->spp_flags & (SPP_ !! 2660 if (copy_from_user(¶ms, optval, optlen))
>> 2661 return -EFAULT;
>> 2662 if (params.spp_flags & (SPP_DSCP | SPP_IPV6_FLOWLABEL))
2630 return -EINVAL; 2663 return -EINVAL;
2631 } else if (optlen != sizeof(*params)) !! 2664 } else {
2632 return -EINVAL; 2665 return -EINVAL;
2633 } 2666 }
2634 2667
2635 /* Validate flags and value parameter 2668 /* Validate flags and value parameters. */
2636 hb_change = params->spp_flags !! 2669 hb_change = params.spp_flags & SPP_HB;
2637 pmtud_change = params->spp_flags !! 2670 pmtud_change = params.spp_flags & SPP_PMTUD;
2638 sackdelay_change = params->spp_flags !! 2671 sackdelay_change = params.spp_flags & SPP_SACKDELAY;
2639 2672
2640 if (hb_change == SPP_HB || 2673 if (hb_change == SPP_HB ||
2641 pmtud_change == SPP_PMTUD || 2674 pmtud_change == SPP_PMTUD ||
2642 sackdelay_change == SPP_SACKDELAY 2675 sackdelay_change == SPP_SACKDELAY ||
2643 params->spp_sackdelay > 500 || !! 2676 params.spp_sackdelay > 500 ||
2644 (params->spp_pathmtu && !! 2677 (params.spp_pathmtu &&
2645 params->spp_pathmtu < SCTP_DEFAU !! 2678 params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
2646 return -EINVAL; 2679 return -EINVAL;
2647 2680
2648 /* If an address other than INADDR_AN 2681 /* If an address other than INADDR_ANY is specified, and
2649 * no transport is found, then the re 2682 * no transport is found, then the request is invalid.
2650 */ 2683 */
2651 if (!sctp_is_any(sk, (union sctp_addr !! 2684 if (!sctp_is_any(sk, (union sctp_addr *)¶ms.spp_address)) {
2652 trans = sctp_addr_id2transpor !! 2685 trans = sctp_addr_id2transport(sk, ¶ms.spp_address,
2653 !! 2686 params.spp_assoc_id);
2654 if (!trans) 2687 if (!trans)
2655 return -EINVAL; 2688 return -EINVAL;
2656 } 2689 }
2657 2690
2658 /* Get association, if assoc_id != SC 2691 /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
2659 * socket is a one to many style sock 2692 * socket is a one to many style socket, and an association
2660 * was not found, then the id was inv 2693 * was not found, then the id was invalid.
2661 */ 2694 */
2662 asoc = sctp_id2assoc(sk, params->spp_ !! 2695 asoc = sctp_id2assoc(sk, params.spp_assoc_id);
2663 if (!asoc && params->spp_assoc_id != !! 2696 if (!asoc && params.spp_assoc_id != SCTP_FUTURE_ASSOC &&
2664 sctp_style(sk, UDP)) 2697 sctp_style(sk, UDP))
2665 return -EINVAL; 2698 return -EINVAL;
2666 2699
2667 /* Heartbeat demand can only be sent 2700 /* Heartbeat demand can only be sent on a transport or
2668 * association, but not a socket. 2701 * association, but not a socket.
2669 */ 2702 */
2670 if (params->spp_flags & SPP_HB_DEMAND !! 2703 if (params.spp_flags & SPP_HB_DEMAND && !trans && !asoc)
2671 return -EINVAL; 2704 return -EINVAL;
2672 2705
2673 /* Process parameters. */ 2706 /* Process parameters. */
2674 error = sctp_apply_peer_addr_params(p !! 2707 error = sctp_apply_peer_addr_params(¶ms, trans, asoc, sp,
2675 h 2708 hb_change, pmtud_change,
2676 s 2709 sackdelay_change);
2677 2710
2678 if (error) 2711 if (error)
2679 return error; 2712 return error;
2680 2713
2681 /* If changes are for association, al 2714 /* If changes are for association, also apply parameters to each
2682 * transport. 2715 * transport.
2683 */ 2716 */
2684 if (!trans && asoc) { 2717 if (!trans && asoc) {
2685 list_for_each_entry(trans, &a 2718 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
2686 transports) { 2719 transports) {
2687 sctp_apply_peer_addr_ !! 2720 sctp_apply_peer_addr_params(¶ms, trans, asoc, sp,
2688 2721 hb_change, pmtud_change,
2689 2722 sackdelay_change);
2690 } 2723 }
2691 } 2724 }
2692 2725
2693 return 0; 2726 return 0;
2694 } 2727 }
2695 2728
2696 static inline __u32 sctp_spp_sackdelay_enable 2729 static inline __u32 sctp_spp_sackdelay_enable(__u32 param_flags)
2697 { 2730 {
2698 return (param_flags & ~SPP_SACKDELAY) 2731 return (param_flags & ~SPP_SACKDELAY) | SPP_SACKDELAY_ENABLE;
2699 } 2732 }
2700 2733
2701 static inline __u32 sctp_spp_sackdelay_disabl 2734 static inline __u32 sctp_spp_sackdelay_disable(__u32 param_flags)
2702 { 2735 {
2703 return (param_flags & ~SPP_SACKDELAY) 2736 return (param_flags & ~SPP_SACKDELAY) | SPP_SACKDELAY_DISABLE;
2704 } 2737 }
2705 2738
2706 static void sctp_apply_asoc_delayed_ack(struc 2739 static void sctp_apply_asoc_delayed_ack(struct sctp_sack_info *params,
2707 struc 2740 struct sctp_association *asoc)
2708 { 2741 {
2709 struct sctp_transport *trans; 2742 struct sctp_transport *trans;
2710 2743
2711 if (params->sack_delay) { 2744 if (params->sack_delay) {
2712 asoc->sackdelay = msecs_to_ji 2745 asoc->sackdelay = msecs_to_jiffies(params->sack_delay);
2713 asoc->param_flags = 2746 asoc->param_flags =
2714 sctp_spp_sackdelay_en 2747 sctp_spp_sackdelay_enable(asoc->param_flags);
2715 } 2748 }
2716 if (params->sack_freq == 1) { 2749 if (params->sack_freq == 1) {
2717 asoc->param_flags = 2750 asoc->param_flags =
2718 sctp_spp_sackdelay_di 2751 sctp_spp_sackdelay_disable(asoc->param_flags);
2719 } else if (params->sack_freq > 1) { 2752 } else if (params->sack_freq > 1) {
2720 asoc->sackfreq = params->sack 2753 asoc->sackfreq = params->sack_freq;
2721 asoc->param_flags = 2754 asoc->param_flags =
2722 sctp_spp_sackdelay_en 2755 sctp_spp_sackdelay_enable(asoc->param_flags);
2723 } 2756 }
2724 2757
2725 list_for_each_entry(trans, &asoc->pee 2758 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
2726 transports) { 2759 transports) {
2727 if (params->sack_delay) { 2760 if (params->sack_delay) {
2728 trans->sackdelay = ms 2761 trans->sackdelay = msecs_to_jiffies(params->sack_delay);
2729 trans->param_flags = 2762 trans->param_flags =
2730 sctp_spp_sack 2763 sctp_spp_sackdelay_enable(trans->param_flags);
2731 } 2764 }
2732 if (params->sack_freq == 1) { 2765 if (params->sack_freq == 1) {
2733 trans->param_flags = 2766 trans->param_flags =
2734 sctp_spp_sack 2767 sctp_spp_sackdelay_disable(trans->param_flags);
2735 } else if (params->sack_freq 2768 } else if (params->sack_freq > 1) {
2736 trans->sackfreq = par 2769 trans->sackfreq = params->sack_freq;
2737 trans->param_flags = 2770 trans->param_flags =
2738 sctp_spp_sack 2771 sctp_spp_sackdelay_enable(trans->param_flags);
2739 } 2772 }
2740 } 2773 }
2741 } 2774 }
2742 2775
2743 /* 2776 /*
2744 * 7.1.23. Get or set delayed ack timer (SCT 2777 * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK)
2745 * 2778 *
2746 * This option will effect the way delayed ac 2779 * This option will effect the way delayed acks are performed. This
2747 * option allows you to get or set the delaye 2780 * option allows you to get or set the delayed ack time, in
2748 * milliseconds. It also allows changing the 2781 * milliseconds. It also allows changing the delayed ack frequency.
2749 * Changing the frequency to 1 disables the d 2782 * Changing the frequency to 1 disables the delayed sack algorithm. If
2750 * the assoc_id is 0, then this sets or gets 2783 * the assoc_id is 0, then this sets or gets the endpoints default
2751 * values. If the assoc_id field is non-zero 2784 * values. If the assoc_id field is non-zero, then the set or get
2752 * effects the specified association for the 2785 * effects the specified association for the one to many model (the
2753 * assoc_id field is ignored by the one to on 2786 * assoc_id field is ignored by the one to one model). Note that if
2754 * sack_delay or sack_freq are 0 when setting 2787 * sack_delay or sack_freq are 0 when setting this option, then the
2755 * current values will remain unchanged. 2788 * current values will remain unchanged.
2756 * 2789 *
2757 * struct sctp_sack_info { 2790 * struct sctp_sack_info {
2758 * sctp_assoc_t sack_assoc_id; 2791 * sctp_assoc_t sack_assoc_id;
2759 * uint32_t sack_delay; 2792 * uint32_t sack_delay;
2760 * uint32_t sack_freq; 2793 * uint32_t sack_freq;
2761 * }; 2794 * };
2762 * 2795 *
2763 * sack_assoc_id - This parameter, indicates 2796 * sack_assoc_id - This parameter, indicates which association the user
2764 * is performing an action upon. Note tha 2797 * is performing an action upon. Note that if this field's value is
2765 * zero then the endpoints default value i 2798 * zero then the endpoints default value is changed (effecting future
2766 * associations only). 2799 * associations only).
2767 * 2800 *
2768 * sack_delay - This parameter contains the 2801 * sack_delay - This parameter contains the number of milliseconds that
2769 * the user is requesting the delayed ACK 2802 * the user is requesting the delayed ACK timer be set to. Note that
2770 * this value is defined in the standard t 2803 * this value is defined in the standard to be between 200 and 500
2771 * milliseconds. 2804 * milliseconds.
2772 * 2805 *
2773 * sack_freq - This parameter contains the n 2806 * sack_freq - This parameter contains the number of packets that must
2774 * be received before a sack is sent witho 2807 * be received before a sack is sent without waiting for the delay
2775 * timer to expire. The default value for 2808 * timer to expire. The default value for this is 2, setting this
2776 * value to 1 will disable the delayed sac 2809 * value to 1 will disable the delayed sack algorithm.
2777 */ 2810 */
2778 static int __sctp_setsockopt_delayed_ack(stru !! 2811
2779 stru !! 2812 static int sctp_setsockopt_delayed_ack(struct sock *sk,
>> 2813 char __user *optval, unsigned int optlen)
2780 { 2814 {
2781 struct sctp_sock *sp = sctp_sk(sk); 2815 struct sctp_sock *sp = sctp_sk(sk);
2782 struct sctp_association *asoc; 2816 struct sctp_association *asoc;
>> 2817 struct sctp_sack_info params;
>> 2818
>> 2819 if (optlen == sizeof(struct sctp_sack_info)) {
>> 2820 if (copy_from_user(¶ms, optval, optlen))
>> 2821 return -EFAULT;
>> 2822
>> 2823 if (params.sack_delay == 0 && params.sack_freq == 0)
>> 2824 return 0;
>> 2825 } else if (optlen == sizeof(struct sctp_assoc_value)) {
>> 2826 pr_warn_ratelimited(DEPRECATED
>> 2827 "%s (pid %d) "
>> 2828 "Use of struct sctp_assoc_value in delayed_ack socket option.\n"
>> 2829 "Use struct sctp_sack_info instead\n",
>> 2830 current->comm, task_pid_nr(current));
>> 2831 if (copy_from_user(¶ms, optval, optlen))
>> 2832 return -EFAULT;
>> 2833
>> 2834 if (params.sack_delay == 0)
>> 2835 params.sack_freq = 1;
>> 2836 else
>> 2837 params.sack_freq = 0;
>> 2838 } else
>> 2839 return -EINVAL;
2783 2840
2784 /* Validate value parameter. */ 2841 /* Validate value parameter. */
2785 if (params->sack_delay > 500) !! 2842 if (params.sack_delay > 500)
2786 return -EINVAL; 2843 return -EINVAL;
2787 2844
2788 /* Get association, if sack_assoc_id 2845 /* Get association, if sack_assoc_id != SCTP_FUTURE_ASSOC and the
2789 * socket is a one to many style sock 2846 * socket is a one to many style socket, and an association
2790 * was not found, then the id was inv 2847 * was not found, then the id was invalid.
2791 */ 2848 */
2792 asoc = sctp_id2assoc(sk, params->sack !! 2849 asoc = sctp_id2assoc(sk, params.sack_assoc_id);
2793 if (!asoc && params->sack_assoc_id > !! 2850 if (!asoc && params.sack_assoc_id > SCTP_ALL_ASSOC &&
2794 sctp_style(sk, UDP)) 2851 sctp_style(sk, UDP))
2795 return -EINVAL; 2852 return -EINVAL;
2796 2853
2797 if (asoc) { 2854 if (asoc) {
2798 sctp_apply_asoc_delayed_ack(p !! 2855 sctp_apply_asoc_delayed_ack(¶ms, asoc);
2799 2856
2800 return 0; 2857 return 0;
2801 } 2858 }
2802 2859
2803 if (sctp_style(sk, TCP)) 2860 if (sctp_style(sk, TCP))
2804 params->sack_assoc_id = SCTP_ !! 2861 params.sack_assoc_id = SCTP_FUTURE_ASSOC;
2805 2862
2806 if (params->sack_assoc_id == SCTP_FUT !! 2863 if (params.sack_assoc_id == SCTP_FUTURE_ASSOC ||
2807 params->sack_assoc_id == SCTP_ALL !! 2864 params.sack_assoc_id == SCTP_ALL_ASSOC) {
2808 if (params->sack_delay) { !! 2865 if (params.sack_delay) {
2809 sp->sackdelay = param !! 2866 sp->sackdelay = params.sack_delay;
2810 sp->param_flags = 2867 sp->param_flags =
2811 sctp_spp_sack 2868 sctp_spp_sackdelay_enable(sp->param_flags);
2812 } 2869 }
2813 if (params->sack_freq == 1) { !! 2870 if (params.sack_freq == 1) {
2814 sp->param_flags = 2871 sp->param_flags =
2815 sctp_spp_sack 2872 sctp_spp_sackdelay_disable(sp->param_flags);
2816 } else if (params->sack_freq !! 2873 } else if (params.sack_freq > 1) {
2817 sp->sackfreq = params !! 2874 sp->sackfreq = params.sack_freq;
2818 sp->param_flags = 2875 sp->param_flags =
2819 sctp_spp_sack 2876 sctp_spp_sackdelay_enable(sp->param_flags);
2820 } 2877 }
2821 } 2878 }
2822 2879
2823 if (params->sack_assoc_id == SCTP_CUR !! 2880 if (params.sack_assoc_id == SCTP_CURRENT_ASSOC ||
2824 params->sack_assoc_id == SCTP_ALL !! 2881 params.sack_assoc_id == SCTP_ALL_ASSOC)
2825 list_for_each_entry(asoc, &sp 2882 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
2826 sctp_apply_asoc_delay !! 2883 sctp_apply_asoc_delayed_ack(¶ms, asoc);
2827 2884
2828 return 0; 2885 return 0;
2829 } 2886 }
2830 2887
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 2888 /* 7.1.3 Initialization Parameters (SCTP_INITMSG)
2859 * 2889 *
2860 * Applications can specify protocol paramete 2890 * Applications can specify protocol parameters for the default association
2861 * initialization. The option name argument 2891 * initialization. The option name argument to setsockopt() and getsockopt()
2862 * is SCTP_INITMSG. 2892 * is SCTP_INITMSG.
2863 * 2893 *
2864 * Setting initialization parameters is effec 2894 * Setting initialization parameters is effective only on an unconnected
2865 * socket (for UDP-style sockets only future 2895 * socket (for UDP-style sockets only future associations are effected
2866 * by the change). With TCP-style sockets, t 2896 * by the change). With TCP-style sockets, this option is inherited by
2867 * sockets derived from a listener socket. 2897 * sockets derived from a listener socket.
2868 */ 2898 */
2869 static int sctp_setsockopt_initmsg(struct soc !! 2899 static int sctp_setsockopt_initmsg(struct sock *sk, char __user *optval, unsigned int optlen)
2870 unsigned i <<
2871 { 2900 {
>> 2901 struct sctp_initmsg sinit;
2872 struct sctp_sock *sp = sctp_sk(sk); 2902 struct sctp_sock *sp = sctp_sk(sk);
2873 2903
2874 if (optlen != sizeof(struct sctp_init 2904 if (optlen != sizeof(struct sctp_initmsg))
2875 return -EINVAL; 2905 return -EINVAL;
>> 2906 if (copy_from_user(&sinit, optval, optlen))
>> 2907 return -EFAULT;
2876 2908
2877 if (sinit->sinit_num_ostreams) !! 2909 if (sinit.sinit_num_ostreams)
2878 sp->initmsg.sinit_num_ostream !! 2910 sp->initmsg.sinit_num_ostreams = sinit.sinit_num_ostreams;
2879 if (sinit->sinit_max_instreams) !! 2911 if (sinit.sinit_max_instreams)
2880 sp->initmsg.sinit_max_instrea !! 2912 sp->initmsg.sinit_max_instreams = sinit.sinit_max_instreams;
2881 if (sinit->sinit_max_attempts) !! 2913 if (sinit.sinit_max_attempts)
2882 sp->initmsg.sinit_max_attempt !! 2914 sp->initmsg.sinit_max_attempts = sinit.sinit_max_attempts;
2883 if (sinit->sinit_max_init_timeo) !! 2915 if (sinit.sinit_max_init_timeo)
2884 sp->initmsg.sinit_max_init_ti !! 2916 sp->initmsg.sinit_max_init_timeo = sinit.sinit_max_init_timeo;
2885 2917
2886 return 0; 2918 return 0;
2887 } 2919 }
2888 2920
2889 /* 2921 /*
2890 * 7.1.14 Set default send parameters (SCTP_D 2922 * 7.1.14 Set default send parameters (SCTP_DEFAULT_SEND_PARAM)
2891 * 2923 *
2892 * Applications that wish to use the sendto 2924 * Applications that wish to use the sendto() system call may wish to
2893 * specify a default set of parameters that 2925 * specify a default set of parameters that would normally be supplied
2894 * through the inclusion of ancillary data. 2926 * through the inclusion of ancillary data. This socket option allows
2895 * such an application to set the default s 2927 * such an application to set the default sctp_sndrcvinfo structure.
2896 * The application that wishes to use this 2928 * The application that wishes to use this socket option simply passes
2897 * in to this call the sctp_sndrcvinfo stru 2929 * in to this call the sctp_sndrcvinfo structure defined in Section
2898 * 5.2.2) The input parameters accepted by 2930 * 5.2.2) The input parameters accepted by this call include
2899 * sinfo_stream, sinfo_flags, sinfo_ppid, s 2931 * sinfo_stream, sinfo_flags, sinfo_ppid, sinfo_context,
2900 * sinfo_timetolive. The user must provide 2932 * sinfo_timetolive. The user must provide the sinfo_assoc_id field in
2901 * to this call if the caller is using the 2933 * to this call if the caller is using the UDP model.
2902 */ 2934 */
2903 static int sctp_setsockopt_default_send_param 2935 static int sctp_setsockopt_default_send_param(struct sock *sk,
2904 !! 2936 char __user *optval,
2905 2937 unsigned int optlen)
2906 { 2938 {
2907 struct sctp_sock *sp = sctp_sk(sk); 2939 struct sctp_sock *sp = sctp_sk(sk);
2908 struct sctp_association *asoc; 2940 struct sctp_association *asoc;
>> 2941 struct sctp_sndrcvinfo info;
2909 2942
2910 if (optlen != sizeof(*info)) !! 2943 if (optlen != sizeof(info))
2911 return -EINVAL; 2944 return -EINVAL;
2912 if (info->sinfo_flags & !! 2945 if (copy_from_user(&info, optval, optlen))
>> 2946 return -EFAULT;
>> 2947 if (info.sinfo_flags &
2913 ~(SCTP_UNORDERED | SCTP_ADDR_OVER 2948 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
2914 SCTP_ABORT | SCTP_EOF)) 2949 SCTP_ABORT | SCTP_EOF))
2915 return -EINVAL; 2950 return -EINVAL;
2916 2951
2917 asoc = sctp_id2assoc(sk, info->sinfo_ !! 2952 asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
2918 if (!asoc && info->sinfo_assoc_id > S !! 2953 if (!asoc && info.sinfo_assoc_id > SCTP_ALL_ASSOC &&
2919 sctp_style(sk, UDP)) 2954 sctp_style(sk, UDP))
2920 return -EINVAL; 2955 return -EINVAL;
2921 2956
2922 if (asoc) { 2957 if (asoc) {
2923 asoc->default_stream = info-> !! 2958 asoc->default_stream = info.sinfo_stream;
2924 asoc->default_flags = info->s !! 2959 asoc->default_flags = info.sinfo_flags;
2925 asoc->default_ppid = info->si !! 2960 asoc->default_ppid = info.sinfo_ppid;
2926 asoc->default_context = info- !! 2961 asoc->default_context = info.sinfo_context;
2927 asoc->default_timetolive = in !! 2962 asoc->default_timetolive = info.sinfo_timetolive;
2928 2963
2929 return 0; 2964 return 0;
2930 } 2965 }
2931 2966
2932 if (sctp_style(sk, TCP)) 2967 if (sctp_style(sk, TCP))
2933 info->sinfo_assoc_id = SCTP_F !! 2968 info.sinfo_assoc_id = SCTP_FUTURE_ASSOC;
2934 2969
2935 if (info->sinfo_assoc_id == SCTP_FUTU !! 2970 if (info.sinfo_assoc_id == SCTP_FUTURE_ASSOC ||
2936 info->sinfo_assoc_id == SCTP_ALL_ !! 2971 info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2937 sp->default_stream = info->si !! 2972 sp->default_stream = info.sinfo_stream;
2938 sp->default_flags = info->sin !! 2973 sp->default_flags = info.sinfo_flags;
2939 sp->default_ppid = info->sinf !! 2974 sp->default_ppid = info.sinfo_ppid;
2940 sp->default_context = info->s !! 2975 sp->default_context = info.sinfo_context;
2941 sp->default_timetolive = info !! 2976 sp->default_timetolive = info.sinfo_timetolive;
2942 } 2977 }
2943 2978
2944 if (info->sinfo_assoc_id == SCTP_CURR !! 2979 if (info.sinfo_assoc_id == SCTP_CURRENT_ASSOC ||
2945 info->sinfo_assoc_id == SCTP_ALL_ !! 2980 info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2946 list_for_each_entry(asoc, &sp 2981 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
2947 asoc->default_stream !! 2982 asoc->default_stream = info.sinfo_stream;
2948 asoc->default_flags = !! 2983 asoc->default_flags = info.sinfo_flags;
2949 asoc->default_ppid = !! 2984 asoc->default_ppid = info.sinfo_ppid;
2950 asoc->default_context !! 2985 asoc->default_context = info.sinfo_context;
2951 asoc->default_timetol !! 2986 asoc->default_timetolive = info.sinfo_timetolive;
2952 } 2987 }
2953 } 2988 }
2954 2989
2955 return 0; 2990 return 0;
2956 } 2991 }
2957 2992
2958 /* RFC6458, Section 8.1.31. Set/get Default S 2993 /* RFC6458, Section 8.1.31. Set/get Default Send Parameters
2959 * (SCTP_DEFAULT_SNDINFO) 2994 * (SCTP_DEFAULT_SNDINFO)
2960 */ 2995 */
2961 static int sctp_setsockopt_default_sndinfo(st 2996 static int sctp_setsockopt_default_sndinfo(struct sock *sk,
2962 st !! 2997 char __user *optval,
2963 un 2998 unsigned int optlen)
2964 { 2999 {
2965 struct sctp_sock *sp = sctp_sk(sk); 3000 struct sctp_sock *sp = sctp_sk(sk);
2966 struct sctp_association *asoc; 3001 struct sctp_association *asoc;
>> 3002 struct sctp_sndinfo info;
2967 3003
2968 if (optlen != sizeof(*info)) !! 3004 if (optlen != sizeof(info))
2969 return -EINVAL; 3005 return -EINVAL;
2970 if (info->snd_flags & !! 3006 if (copy_from_user(&info, optval, optlen))
>> 3007 return -EFAULT;
>> 3008 if (info.snd_flags &
2971 ~(SCTP_UNORDERED | SCTP_ADDR_OVER 3009 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
2972 SCTP_ABORT | SCTP_EOF)) 3010 SCTP_ABORT | SCTP_EOF))
2973 return -EINVAL; 3011 return -EINVAL;
2974 3012
2975 asoc = sctp_id2assoc(sk, info->snd_as !! 3013 asoc = sctp_id2assoc(sk, info.snd_assoc_id);
2976 if (!asoc && info->snd_assoc_id > SCT !! 3014 if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC &&
2977 sctp_style(sk, UDP)) 3015 sctp_style(sk, UDP))
2978 return -EINVAL; 3016 return -EINVAL;
2979 3017
2980 if (asoc) { 3018 if (asoc) {
2981 asoc->default_stream = info-> !! 3019 asoc->default_stream = info.snd_sid;
2982 asoc->default_flags = info->s !! 3020 asoc->default_flags = info.snd_flags;
2983 asoc->default_ppid = info->sn !! 3021 asoc->default_ppid = info.snd_ppid;
2984 asoc->default_context = info- !! 3022 asoc->default_context = info.snd_context;
2985 3023
2986 return 0; 3024 return 0;
2987 } 3025 }
2988 3026
2989 if (sctp_style(sk, TCP)) 3027 if (sctp_style(sk, TCP))
2990 info->snd_assoc_id = SCTP_FUT !! 3028 info.snd_assoc_id = SCTP_FUTURE_ASSOC;
2991 3029
2992 if (info->snd_assoc_id == SCTP_FUTURE !! 3030 if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||
2993 info->snd_assoc_id == SCTP_ALL_AS !! 3031 info.snd_assoc_id == SCTP_ALL_ASSOC) {
2994 sp->default_stream = info->sn !! 3032 sp->default_stream = info.snd_sid;
2995 sp->default_flags = info->snd !! 3033 sp->default_flags = info.snd_flags;
2996 sp->default_ppid = info->snd_ !! 3034 sp->default_ppid = info.snd_ppid;
2997 sp->default_context = info->s !! 3035 sp->default_context = info.snd_context;
2998 } 3036 }
2999 3037
3000 if (info->snd_assoc_id == SCTP_CURREN !! 3038 if (info.snd_assoc_id == SCTP_CURRENT_ASSOC ||
3001 info->snd_assoc_id == SCTP_ALL_AS !! 3039 info.snd_assoc_id == SCTP_ALL_ASSOC) {
3002 list_for_each_entry(asoc, &sp 3040 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
3003 asoc->default_stream !! 3041 asoc->default_stream = info.snd_sid;
3004 asoc->default_flags = !! 3042 asoc->default_flags = info.snd_flags;
3005 asoc->default_ppid = !! 3043 asoc->default_ppid = info.snd_ppid;
3006 asoc->default_context !! 3044 asoc->default_context = info.snd_context;
3007 } 3045 }
3008 } 3046 }
3009 3047
3010 return 0; 3048 return 0;
3011 } 3049 }
3012 3050
3013 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_A 3051 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
3014 * 3052 *
3015 * Requests that the local SCTP stack use the 3053 * Requests that the local SCTP stack use the enclosed peer address as
3016 * the association primary. The enclosed add 3054 * the association primary. The enclosed address must be one of the
3017 * association peer's addresses. 3055 * association peer's addresses.
3018 */ 3056 */
3019 static int sctp_setsockopt_primary_addr(struc !! 3057 static int sctp_setsockopt_primary_addr(struct sock *sk, char __user *optval,
3020 unsig 3058 unsigned int optlen)
3021 { 3059 {
>> 3060 struct sctp_prim prim;
3022 struct sctp_transport *trans; 3061 struct sctp_transport *trans;
3023 struct sctp_af *af; 3062 struct sctp_af *af;
3024 int err; 3063 int err;
3025 3064
3026 if (optlen != sizeof(struct sctp_prim 3065 if (optlen != sizeof(struct sctp_prim))
3027 return -EINVAL; 3066 return -EINVAL;
3028 3067
>> 3068 if (copy_from_user(&prim, optval, sizeof(struct sctp_prim)))
>> 3069 return -EFAULT;
>> 3070
3029 /* Allow security module to validate 3071 /* Allow security module to validate address but need address len. */
3030 af = sctp_get_af_specific(prim->ssp_a !! 3072 af = sctp_get_af_specific(prim.ssp_addr.ss_family);
3031 if (!af) 3073 if (!af)
3032 return -EINVAL; 3074 return -EINVAL;
3033 3075
3034 err = security_sctp_bind_connect(sk, 3076 err = security_sctp_bind_connect(sk, SCTP_PRIMARY_ADDR,
3035 (str !! 3077 (struct sockaddr *)&prim.ssp_addr,
3036 af-> 3078 af->sockaddr_len);
3037 if (err) 3079 if (err)
3038 return err; 3080 return err;
3039 3081
3040 trans = sctp_addr_id2transport(sk, &p !! 3082 trans = sctp_addr_id2transport(sk, &prim.ssp_addr, prim.ssp_assoc_id);
3041 if (!trans) 3083 if (!trans)
3042 return -EINVAL; 3084 return -EINVAL;
3043 3085
3044 sctp_assoc_set_primary(trans->asoc, t 3086 sctp_assoc_set_primary(trans->asoc, trans);
3045 3087
3046 return 0; 3088 return 0;
3047 } 3089 }
3048 3090
3049 /* 3091 /*
3050 * 7.1.5 SCTP_NODELAY 3092 * 7.1.5 SCTP_NODELAY
3051 * 3093 *
3052 * Turn on/off any Nagle-like algorithm. Thi 3094 * Turn on/off any Nagle-like algorithm. This means that packets are
3053 * generally sent as soon as possible and no 3095 * generally sent as soon as possible and no unnecessary delays are
3054 * introduced, at the cost of more packets in 3096 * introduced, at the cost of more packets in the network. Expects an
3055 * integer boolean flag. 3097 * integer boolean flag.
3056 */ 3098 */
3057 static int sctp_setsockopt_nodelay(struct soc !! 3099 static int sctp_setsockopt_nodelay(struct sock *sk, char __user *optval,
3058 unsigned i 3100 unsigned int optlen)
3059 { 3101 {
>> 3102 int val;
>> 3103
3060 if (optlen < sizeof(int)) 3104 if (optlen < sizeof(int))
3061 return -EINVAL; 3105 return -EINVAL;
3062 sctp_sk(sk)->nodelay = (*val == 0) ? !! 3106 if (get_user(val, (int __user *)optval))
>> 3107 return -EFAULT;
>> 3108
>> 3109 sctp_sk(sk)->nodelay = (val == 0) ? 0 : 1;
3063 return 0; 3110 return 0;
3064 } 3111 }
3065 3112
3066 /* 3113 /*
3067 * 3114 *
3068 * 7.1.1 SCTP_RTOINFO 3115 * 7.1.1 SCTP_RTOINFO
3069 * 3116 *
3070 * The protocol parameters used to initialize 3117 * The protocol parameters used to initialize and bound retransmission
3071 * timeout (RTO) are tunable. sctp_rtoinfo st 3118 * timeout (RTO) are tunable. sctp_rtoinfo structure is used to access
3072 * and modify these parameters. 3119 * and modify these parameters.
3073 * All parameters are time values, in millise 3120 * All parameters are time values, in milliseconds. A value of 0, when
3074 * modifying the parameters, indicates that t 3121 * modifying the parameters, indicates that the current value should not
3075 * be changed. 3122 * be changed.
3076 * 3123 *
3077 */ 3124 */
3078 static int sctp_setsockopt_rtoinfo(struct soc !! 3125 static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigned int optlen)
3079 struct sct <<
3080 unsigned i <<
3081 { 3126 {
>> 3127 struct sctp_rtoinfo rtoinfo;
3082 struct sctp_association *asoc; 3128 struct sctp_association *asoc;
3083 unsigned long rto_min, rto_max; 3129 unsigned long rto_min, rto_max;
3084 struct sctp_sock *sp = sctp_sk(sk); 3130 struct sctp_sock *sp = sctp_sk(sk);
3085 3131
3086 if (optlen != sizeof (struct sctp_rto 3132 if (optlen != sizeof (struct sctp_rtoinfo))
3087 return -EINVAL; 3133 return -EINVAL;
3088 3134
3089 asoc = sctp_id2assoc(sk, rtoinfo->srt !! 3135 if (copy_from_user(&rtoinfo, optval, optlen))
>> 3136 return -EFAULT;
>> 3137
>> 3138 asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
3090 3139
3091 /* Set the values to the specific ass 3140 /* Set the values to the specific association */
3092 if (!asoc && rtoinfo->srto_assoc_id ! !! 3141 if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
3093 sctp_style(sk, UDP)) 3142 sctp_style(sk, UDP))
3094 return -EINVAL; 3143 return -EINVAL;
3095 3144
3096 rto_max = rtoinfo->srto_max; !! 3145 rto_max = rtoinfo.srto_max;
3097 rto_min = rtoinfo->srto_min; !! 3146 rto_min = rtoinfo.srto_min;
3098 3147
3099 if (rto_max) 3148 if (rto_max)
3100 rto_max = asoc ? msecs_to_jif 3149 rto_max = asoc ? msecs_to_jiffies(rto_max) : rto_max;
3101 else 3150 else
3102 rto_max = asoc ? asoc->rto_ma 3151 rto_max = asoc ? asoc->rto_max : sp->rtoinfo.srto_max;
3103 3152
3104 if (rto_min) 3153 if (rto_min)
3105 rto_min = asoc ? msecs_to_jif 3154 rto_min = asoc ? msecs_to_jiffies(rto_min) : rto_min;
3106 else 3155 else
3107 rto_min = asoc ? asoc->rto_mi 3156 rto_min = asoc ? asoc->rto_min : sp->rtoinfo.srto_min;
3108 3157
3109 if (rto_min > rto_max) 3158 if (rto_min > rto_max)
3110 return -EINVAL; 3159 return -EINVAL;
3111 3160
3112 if (asoc) { 3161 if (asoc) {
3113 if (rtoinfo->srto_initial != !! 3162 if (rtoinfo.srto_initial != 0)
3114 asoc->rto_initial = 3163 asoc->rto_initial =
3115 msecs_to_jiff !! 3164 msecs_to_jiffies(rtoinfo.srto_initial);
3116 asoc->rto_max = rto_max; 3165 asoc->rto_max = rto_max;
3117 asoc->rto_min = rto_min; 3166 asoc->rto_min = rto_min;
3118 } else { 3167 } else {
3119 /* If there is no association 3168 /* If there is no association or the association-id = 0
3120 * set the values to the endp 3169 * set the values to the endpoint.
3121 */ 3170 */
3122 if (rtoinfo->srto_initial != !! 3171 if (rtoinfo.srto_initial != 0)
3123 sp->rtoinfo.srto_init !! 3172 sp->rtoinfo.srto_initial = rtoinfo.srto_initial;
3124 sp->rtoinfo.srto_max = rto_ma 3173 sp->rtoinfo.srto_max = rto_max;
3125 sp->rtoinfo.srto_min = rto_mi 3174 sp->rtoinfo.srto_min = rto_min;
3126 } 3175 }
3127 3176
3128 return 0; 3177 return 0;
3129 } 3178 }
3130 3179
3131 /* 3180 /*
3132 * 3181 *
3133 * 7.1.2 SCTP_ASSOCINFO 3182 * 7.1.2 SCTP_ASSOCINFO
3134 * 3183 *
3135 * This option is used to tune the maximum re 3184 * This option is used to tune the maximum retransmission attempts
3136 * of the association. 3185 * of the association.
3137 * Returns an error if the new association re 3186 * Returns an error if the new association retransmission value is
3138 * greater than the sum of the retransmission 3187 * greater than the sum of the retransmission value of the peer.
3139 * See [SCTP] for more information. 3188 * See [SCTP] for more information.
3140 * 3189 *
3141 */ 3190 */
3142 static int sctp_setsockopt_associnfo(struct s !! 3191 static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, unsigned int optlen)
3143 struct s <<
3144 unsigned <<
3145 { 3192 {
3146 3193
>> 3194 struct sctp_assocparams assocparams;
3147 struct sctp_association *asoc; 3195 struct sctp_association *asoc;
3148 3196
3149 if (optlen != sizeof(struct sctp_asso 3197 if (optlen != sizeof(struct sctp_assocparams))
3150 return -EINVAL; 3198 return -EINVAL;
>> 3199 if (copy_from_user(&assocparams, optval, optlen))
>> 3200 return -EFAULT;
3151 3201
3152 asoc = sctp_id2assoc(sk, assocparams- !! 3202 asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
3153 3203
3154 if (!asoc && assocparams->sasoc_assoc !! 3204 if (!asoc && assocparams.sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
3155 sctp_style(sk, UDP)) 3205 sctp_style(sk, UDP))
3156 return -EINVAL; 3206 return -EINVAL;
3157 3207
3158 /* Set the values to the specific ass 3208 /* Set the values to the specific association */
3159 if (asoc) { 3209 if (asoc) {
3160 if (assocparams->sasoc_asocma !! 3210 if (assocparams.sasoc_asocmaxrxt != 0) {
3161 __u32 path_sum = 0; 3211 __u32 path_sum = 0;
3162 int paths = 0; 3212 int paths = 0;
3163 struct sctp_transport 3213 struct sctp_transport *peer_addr;
3164 3214
3165 list_for_each_entry(p 3215 list_for_each_entry(peer_addr, &asoc->peer.transport_addr_list,
3166 trans 3216 transports) {
3167 path_sum += p 3217 path_sum += peer_addr->pathmaxrxt;
3168 paths++; 3218 paths++;
3169 } 3219 }
3170 3220
3171 /* Only validate asoc 3221 /* Only validate asocmaxrxt if we have more than
3172 * one path/transport 3222 * one path/transport. We do this because path
3173 * retransmissions ar 3223 * retransmissions are only counted when we have more
3174 * then one path. 3224 * then one path.
3175 */ 3225 */
3176 if (paths > 1 && 3226 if (paths > 1 &&
3177 assocparams->saso !! 3227 assocparams.sasoc_asocmaxrxt > path_sum)
3178 return -EINVA 3228 return -EINVAL;
3179 3229
3180 asoc->max_retrans = a !! 3230 asoc->max_retrans = assocparams.sasoc_asocmaxrxt;
3181 } 3231 }
3182 3232
3183 if (assocparams->sasoc_cookie !! 3233 if (assocparams.sasoc_cookie_life != 0)
3184 asoc->cookie_life = !! 3234 asoc->cookie_life = ms_to_ktime(assocparams.sasoc_cookie_life);
3185 ms_to_ktime(a <<
3186 } else { 3235 } else {
3187 /* Set the values to the endp 3236 /* Set the values to the endpoint */
3188 struct sctp_sock *sp = sctp_s 3237 struct sctp_sock *sp = sctp_sk(sk);
3189 3238
3190 if (assocparams->sasoc_asocma !! 3239 if (assocparams.sasoc_asocmaxrxt != 0)
3191 sp->assocparams.sasoc 3240 sp->assocparams.sasoc_asocmaxrxt =
3192 !! 3241 assocparams.sasoc_asocmaxrxt;
3193 if (assocparams->sasoc_cookie !! 3242 if (assocparams.sasoc_cookie_life != 0)
3194 sp->assocparams.sasoc 3243 sp->assocparams.sasoc_cookie_life =
3195 !! 3244 assocparams.sasoc_cookie_life;
3196 } 3245 }
3197 return 0; 3246 return 0;
3198 } 3247 }
3199 3248
3200 /* 3249 /*
3201 * 7.1.16 Set/clear IPv4 mapped addresses (SC 3250 * 7.1.16 Set/clear IPv4 mapped addresses (SCTP_I_WANT_MAPPED_V4_ADDR)
3202 * 3251 *
3203 * This socket option is a boolean flag which 3252 * This socket option is a boolean flag which turns on or off mapped V4
3204 * addresses. If this option is turned on an 3253 * addresses. If this option is turned on and the socket is type
3205 * PF_INET6, then IPv4 addresses will be mapp 3254 * PF_INET6, then IPv4 addresses will be mapped to V6 representation.
3206 * If this option is turned off, then no mapp 3255 * If this option is turned off, then no mapping will be done of V4
3207 * addresses and a user will receive both PF_ 3256 * addresses and a user will receive both PF_INET6 and PF_INET type
3208 * addresses on the socket. 3257 * addresses on the socket.
3209 */ 3258 */
3210 static int sctp_setsockopt_mappedv4(struct so !! 3259 static int sctp_setsockopt_mappedv4(struct sock *sk, char __user *optval, unsigned int optlen)
3211 unsigned <<
3212 { 3260 {
>> 3261 int val;
3213 struct sctp_sock *sp = sctp_sk(sk); 3262 struct sctp_sock *sp = sctp_sk(sk);
3214 3263
3215 if (optlen < sizeof(int)) 3264 if (optlen < sizeof(int))
3216 return -EINVAL; 3265 return -EINVAL;
3217 if (*val) !! 3266 if (get_user(val, (int __user *)optval))
>> 3267 return -EFAULT;
>> 3268 if (val)
3218 sp->v4mapped = 1; 3269 sp->v4mapped = 1;
3219 else 3270 else
3220 sp->v4mapped = 0; 3271 sp->v4mapped = 0;
3221 3272
3222 return 0; 3273 return 0;
3223 } 3274 }
3224 3275
3225 /* 3276 /*
3226 * 8.1.16. Get or Set the Maximum Fragmentat 3277 * 8.1.16. Get or Set the Maximum Fragmentation Size (SCTP_MAXSEG)
3227 * This option will get or set the maximum si 3278 * This option will get or set the maximum size to put in any outgoing
3228 * SCTP DATA chunk. If a message is larger t 3279 * SCTP DATA chunk. If a message is larger than this size it will be
3229 * fragmented by SCTP into the specified size 3280 * fragmented by SCTP into the specified size. Note that the underlying
3230 * SCTP implementation may fragment into smal 3281 * SCTP implementation may fragment into smaller sized chunks when the
3231 * PMTU of the underlying association is smal 3282 * PMTU of the underlying association is smaller than the value set by
3232 * the user. The default value for this opti 3283 * the user. The default value for this option is '' which indicates
3233 * the user is NOT limiting fragmentation and 3284 * the user is NOT limiting fragmentation and only the PMTU will effect
3234 * SCTP's choice of DATA chunk size. Note al 3285 * SCTP's choice of DATA chunk size. Note also that values set larger
3235 * than the maximum size of an IP datagram wi 3286 * than the maximum size of an IP datagram will effectively let SCTP
3236 * control fragmentation (i.e. the same as se 3287 * control fragmentation (i.e. the same as setting this option to 0).
3237 * 3288 *
3238 * The following structure is used to access 3289 * The following structure is used to access and modify this parameter:
3239 * 3290 *
3240 * struct sctp_assoc_value { 3291 * struct sctp_assoc_value {
3241 * sctp_assoc_t assoc_id; 3292 * sctp_assoc_t assoc_id;
3242 * uint32_t assoc_value; 3293 * uint32_t assoc_value;
3243 * }; 3294 * };
3244 * 3295 *
3245 * assoc_id: This parameter is ignored for o 3296 * assoc_id: This parameter is ignored for one-to-one style sockets.
3246 * For one-to-many style sockets this para 3297 * For one-to-many style sockets this parameter indicates which
3247 * association the user is performing an a 3298 * association the user is performing an action upon. Note that if
3248 * this field's value is zero then the end 3299 * this field's value is zero then the endpoints default value is
3249 * changed (effecting future associations 3300 * changed (effecting future associations only).
3250 * assoc_value: This parameter specifies the 3301 * assoc_value: This parameter specifies the maximum size in bytes.
3251 */ 3302 */
3252 static int sctp_setsockopt_maxseg(struct sock !! 3303 static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned int optlen)
3253 struct sctp <<
3254 unsigned in <<
3255 { 3304 {
3256 struct sctp_sock *sp = sctp_sk(sk); 3305 struct sctp_sock *sp = sctp_sk(sk);
>> 3306 struct sctp_assoc_value params;
3257 struct sctp_association *asoc; 3307 struct sctp_association *asoc;
3258 sctp_assoc_t assoc_id; <<
3259 int val; 3308 int val;
3260 3309
3261 if (optlen == sizeof(int)) { 3310 if (optlen == sizeof(int)) {
3262 pr_warn_ratelimited(DEPRECATE 3311 pr_warn_ratelimited(DEPRECATED
3263 "%s (pid 3312 "%s (pid %d) "
3264 "Use of i 3313 "Use of int in maxseg socket option.\n"
3265 "Use stru 3314 "Use struct sctp_assoc_value instead\n",
3266 current-> 3315 current->comm, task_pid_nr(current));
3267 assoc_id = SCTP_FUTURE_ASSOC; !! 3316 if (copy_from_user(&val, optval, optlen))
3268 val = *(int *)params; !! 3317 return -EFAULT;
>> 3318 params.assoc_id = SCTP_FUTURE_ASSOC;
3269 } else if (optlen == sizeof(struct sc 3319 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3270 assoc_id = params->assoc_id; !! 3320 if (copy_from_user(¶ms, optval, optlen))
3271 val = params->assoc_value; !! 3321 return -EFAULT;
>> 3322 val = params.assoc_value;
3272 } else { 3323 } else {
3273 return -EINVAL; 3324 return -EINVAL;
3274 } 3325 }
3275 3326
3276 asoc = sctp_id2assoc(sk, assoc_id); !! 3327 asoc = sctp_id2assoc(sk, params.assoc_id);
3277 if (!asoc && assoc_id != SCTP_FUTURE_ !! 3328 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3278 sctp_style(sk, UDP)) 3329 sctp_style(sk, UDP))
3279 return -EINVAL; 3330 return -EINVAL;
3280 3331
3281 if (val) { 3332 if (val) {
3282 int min_len, max_len; 3333 int min_len, max_len;
3283 __u16 datasize = asoc ? sctp_ 3334 __u16 datasize = asoc ? sctp_datachk_len(&asoc->stream) :
3284 sizeof(struc 3335 sizeof(struct sctp_data_chunk);
3285 3336
3286 min_len = sctp_min_frag_point 3337 min_len = sctp_min_frag_point(sp, datasize);
3287 max_len = SCTP_MAX_CHUNK_LEN 3338 max_len = SCTP_MAX_CHUNK_LEN - datasize;
3288 3339
3289 if (val < min_len || val > ma 3340 if (val < min_len || val > max_len)
3290 return -EINVAL; 3341 return -EINVAL;
3291 } 3342 }
3292 3343
3293 if (asoc) { 3344 if (asoc) {
3294 asoc->user_frag = val; 3345 asoc->user_frag = val;
3295 sctp_assoc_update_frag_point( 3346 sctp_assoc_update_frag_point(asoc);
3296 } else { 3347 } else {
3297 sp->user_frag = val; 3348 sp->user_frag = val;
3298 } 3349 }
3299 3350
3300 return 0; 3351 return 0;
3301 } 3352 }
3302 3353
3303 3354
3304 /* 3355 /*
3305 * 7.1.9 Set Peer Primary Address (SCTP_SET_ 3356 * 7.1.9 Set Peer Primary Address (SCTP_SET_PEER_PRIMARY_ADDR)
3306 * 3357 *
3307 * Requests that the peer mark the enclosed 3358 * Requests that the peer mark the enclosed address as the association
3308 * primary. The enclosed address must be on 3359 * primary. The enclosed address must be one of the association's
3309 * locally bound addresses. The following s 3360 * locally bound addresses. The following structure is used to make a
3310 * set primary request: 3361 * set primary request:
3311 */ 3362 */
3312 static int sctp_setsockopt_peer_primary_addr( !! 3363 static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optval,
3313 <<
3314 3364 unsigned int optlen)
3315 { 3365 {
3316 struct sctp_sock *sp; 3366 struct sctp_sock *sp;
3317 struct sctp_association *asoc = NULL; 3367 struct sctp_association *asoc = NULL;
>> 3368 struct sctp_setpeerprim prim;
3318 struct sctp_chunk *chunk; 3369 struct sctp_chunk *chunk;
3319 struct sctp_af *af; 3370 struct sctp_af *af;
3320 int err; 3371 int err;
3321 3372
3322 sp = sctp_sk(sk); 3373 sp = sctp_sk(sk);
3323 3374
3324 if (!sp->ep->asconf_enable) 3375 if (!sp->ep->asconf_enable)
3325 return -EPERM; 3376 return -EPERM;
3326 3377
3327 if (optlen != sizeof(struct sctp_setp 3378 if (optlen != sizeof(struct sctp_setpeerprim))
3328 return -EINVAL; 3379 return -EINVAL;
3329 3380
3330 asoc = sctp_id2assoc(sk, prim->sspp_a !! 3381 if (copy_from_user(&prim, optval, optlen))
>> 3382 return -EFAULT;
>> 3383
>> 3384 asoc = sctp_id2assoc(sk, prim.sspp_assoc_id);
3331 if (!asoc) 3385 if (!asoc)
3332 return -EINVAL; 3386 return -EINVAL;
3333 3387
3334 if (!asoc->peer.asconf_capable) 3388 if (!asoc->peer.asconf_capable)
3335 return -EPERM; 3389 return -EPERM;
3336 3390
3337 if (asoc->peer.addip_disabled_mask & 3391 if (asoc->peer.addip_disabled_mask & SCTP_PARAM_SET_PRIMARY)
3338 return -EPERM; 3392 return -EPERM;
3339 3393
3340 if (!sctp_state(asoc, ESTABLISHED)) 3394 if (!sctp_state(asoc, ESTABLISHED))
3341 return -ENOTCONN; 3395 return -ENOTCONN;
3342 3396
3343 af = sctp_get_af_specific(prim->sspp_ !! 3397 af = sctp_get_af_specific(prim.sspp_addr.ss_family);
3344 if (!af) 3398 if (!af)
3345 return -EINVAL; 3399 return -EINVAL;
3346 3400
3347 if (!af->addr_valid((union sctp_addr !! 3401 if (!af->addr_valid((union sctp_addr *)&prim.sspp_addr, sp, NULL))
3348 return -EADDRNOTAVAIL; 3402 return -EADDRNOTAVAIL;
3349 3403
3350 if (!sctp_assoc_lookup_laddr(asoc, (u !! 3404 if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim.sspp_addr))
3351 return -EADDRNOTAVAIL; 3405 return -EADDRNOTAVAIL;
3352 3406
3353 /* Allow security module to validate 3407 /* Allow security module to validate address. */
3354 err = security_sctp_bind_connect(sk, 3408 err = security_sctp_bind_connect(sk, SCTP_SET_PEER_PRIMARY_ADDR,
3355 (str !! 3409 (struct sockaddr *)&prim.sspp_addr,
3356 af-> 3410 af->sockaddr_len);
3357 if (err) 3411 if (err)
3358 return err; 3412 return err;
3359 3413
3360 /* Create an ASCONF chunk with SET_PR 3414 /* Create an ASCONF chunk with SET_PRIMARY parameter */
3361 chunk = sctp_make_asconf_set_prim(aso 3415 chunk = sctp_make_asconf_set_prim(asoc,
3362 (un !! 3416 (union sctp_addr *)&prim.sspp_addr);
3363 if (!chunk) 3417 if (!chunk)
3364 return -ENOMEM; 3418 return -ENOMEM;
3365 3419
3366 err = sctp_send_asconf(asoc, chunk); 3420 err = sctp_send_asconf(asoc, chunk);
3367 3421
3368 pr_debug("%s: we set peer primary add 3422 pr_debug("%s: we set peer primary addr primitively\n", __func__);
3369 3423
3370 return err; 3424 return err;
3371 } 3425 }
3372 3426
3373 static int sctp_setsockopt_adaptation_layer(s !! 3427 static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval,
3374 s <<
3375 u 3428 unsigned int optlen)
3376 { 3429 {
>> 3430 struct sctp_setadaptation adaptation;
>> 3431
3377 if (optlen != sizeof(struct sctp_seta 3432 if (optlen != sizeof(struct sctp_setadaptation))
3378 return -EINVAL; 3433 return -EINVAL;
>> 3434 if (copy_from_user(&adaptation, optval, optlen))
>> 3435 return -EFAULT;
3379 3436
3380 sctp_sk(sk)->adaptation_ind = adapt-> !! 3437 sctp_sk(sk)->adaptation_ind = adaptation.ssb_adaptation_ind;
3381 3438
3382 return 0; 3439 return 0;
3383 } 3440 }
3384 3441
3385 /* 3442 /*
3386 * 7.1.29. Set or Get the default context (S 3443 * 7.1.29. Set or Get the default context (SCTP_CONTEXT)
3387 * 3444 *
3388 * The context field in the sctp_sndrcvinfo s 3445 * The context field in the sctp_sndrcvinfo structure is normally only
3389 * used when a failed message is retrieved ho 3446 * used when a failed message is retrieved holding the value that was
3390 * sent down on the actual send call. This o 3447 * sent down on the actual send call. This option allows the setting of
3391 * a default context on an association basis 3448 * a default context on an association basis that will be received on
3392 * reading messages from the peer. This is e 3449 * reading messages from the peer. This is especially helpful in the
3393 * one-2-many model for an application to kee 3450 * one-2-many model for an application to keep some reference to an
3394 * internal state machine that is processing 3451 * internal state machine that is processing messages on the
3395 * association. Note that the setting of thi 3452 * association. Note that the setting of this value only effects
3396 * received messages from the peer and does n 3453 * received messages from the peer and does not effect the value that is
3397 * saved with outbound messages. 3454 * saved with outbound messages.
3398 */ 3455 */
3399 static int sctp_setsockopt_context(struct soc !! 3456 static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
3400 struct sct <<
3401 unsigned i 3457 unsigned int optlen)
3402 { 3458 {
3403 struct sctp_sock *sp = sctp_sk(sk); 3459 struct sctp_sock *sp = sctp_sk(sk);
>> 3460 struct sctp_assoc_value params;
3404 struct sctp_association *asoc; 3461 struct sctp_association *asoc;
3405 3462
3406 if (optlen != sizeof(struct sctp_asso 3463 if (optlen != sizeof(struct sctp_assoc_value))
3407 return -EINVAL; 3464 return -EINVAL;
>> 3465 if (copy_from_user(¶ms, optval, optlen))
>> 3466 return -EFAULT;
3408 3467
3409 asoc = sctp_id2assoc(sk, params->asso !! 3468 asoc = sctp_id2assoc(sk, params.assoc_id);
3410 if (!asoc && params->assoc_id > SCTP_ !! 3469 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
3411 sctp_style(sk, UDP)) 3470 sctp_style(sk, UDP))
3412 return -EINVAL; 3471 return -EINVAL;
3413 3472
3414 if (asoc) { 3473 if (asoc) {
3415 asoc->default_rcv_context = p !! 3474 asoc->default_rcv_context = params.assoc_value;
3416 3475
3417 return 0; 3476 return 0;
3418 } 3477 }
3419 3478
3420 if (sctp_style(sk, TCP)) 3479 if (sctp_style(sk, TCP))
3421 params->assoc_id = SCTP_FUTUR !! 3480 params.assoc_id = SCTP_FUTURE_ASSOC;
3422 3481
3423 if (params->assoc_id == SCTP_FUTURE_A !! 3482 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3424 params->assoc_id == SCTP_ALL_ASSO !! 3483 params.assoc_id == SCTP_ALL_ASSOC)
3425 sp->default_rcv_context = par !! 3484 sp->default_rcv_context = params.assoc_value;
3426 3485
3427 if (params->assoc_id == SCTP_CURRENT_ !! 3486 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
3428 params->assoc_id == SCTP_ALL_ASSO !! 3487 params.assoc_id == SCTP_ALL_ASSOC)
3429 list_for_each_entry(asoc, &sp 3488 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3430 asoc->default_rcv_con !! 3489 asoc->default_rcv_context = params.assoc_value;
3431 3490
3432 return 0; 3491 return 0;
3433 } 3492 }
3434 3493
3435 /* 3494 /*
3436 * 7.1.24. Get or set fragmented interleave 3495 * 7.1.24. Get or set fragmented interleave (SCTP_FRAGMENT_INTERLEAVE)
3437 * 3496 *
3438 * This options will at a minimum specify if 3497 * This options will at a minimum specify if the implementation is doing
3439 * fragmented interleave. Fragmented interle 3498 * fragmented interleave. Fragmented interleave, for a one to many
3440 * socket, is when subsequent calls to receiv 3499 * socket, is when subsequent calls to receive a message may return
3441 * parts of messages from different associati 3500 * parts of messages from different associations. Some implementations
3442 * may allow you to turn this value on or off 3501 * may allow you to turn this value on or off. If so, when turned off,
3443 * no fragment interleave will occur (which w 3502 * no fragment interleave will occur (which will cause a head of line
3444 * blocking amongst multiple associations sha 3503 * blocking amongst multiple associations sharing the same one to many
3445 * socket). When this option is turned on, t 3504 * socket). When this option is turned on, then each receive call may
3446 * come from a different association (thus th 3505 * come from a different association (thus the user must receive data
3447 * with the extended calls (e.g. sctp_recvmsg 3506 * with the extended calls (e.g. sctp_recvmsg) to keep track of which
3448 * association each receive belongs to. 3507 * association each receive belongs to.
3449 * 3508 *
3450 * This option takes a boolean value. A non- 3509 * This option takes a boolean value. A non-zero value indicates that
3451 * fragmented interleave is on. A value of z 3510 * fragmented interleave is on. A value of zero indicates that
3452 * fragmented interleave is off. 3511 * fragmented interleave is off.
3453 * 3512 *
3454 * Note that it is important that an implemen 3513 * Note that it is important that an implementation that allows this
3455 * option to be turned on, have it off by def 3514 * option to be turned on, have it off by default. Otherwise an unaware
3456 * application using the one to many model ma 3515 * application using the one to many model may become confused and act
3457 * incorrectly. 3516 * incorrectly.
3458 */ 3517 */
3459 static int sctp_setsockopt_fragment_interleav !! 3518 static int sctp_setsockopt_fragment_interleave(struct sock *sk,
>> 3519 char __user *optval,
3460 3520 unsigned int optlen)
3461 { 3521 {
>> 3522 int val;
>> 3523
3462 if (optlen != sizeof(int)) 3524 if (optlen != sizeof(int))
3463 return -EINVAL; 3525 return -EINVAL;
>> 3526 if (get_user(val, (int __user *)optval))
>> 3527 return -EFAULT;
3464 3528
3465 sctp_sk(sk)->frag_interleave = !!*val !! 3529 sctp_sk(sk)->frag_interleave = !!val;
3466 3530
3467 if (!sctp_sk(sk)->frag_interleave) 3531 if (!sctp_sk(sk)->frag_interleave)
3468 sctp_sk(sk)->ep->intl_enable 3532 sctp_sk(sk)->ep->intl_enable = 0;
3469 3533
3470 return 0; 3534 return 0;
3471 } 3535 }
3472 3536
3473 /* 3537 /*
3474 * 8.1.21. Set or Get the SCTP Partial Deliv 3538 * 8.1.21. Set or Get the SCTP Partial Delivery Point
3475 * (SCTP_PARTIAL_DELIVERY_POINT) 3539 * (SCTP_PARTIAL_DELIVERY_POINT)
3476 * 3540 *
3477 * This option will set or get the SCTP parti 3541 * This option will set or get the SCTP partial delivery point. This
3478 * point is the size of a message where the p 3542 * point is the size of a message where the partial delivery API will be
3479 * invoked to help free up rwnd space for the 3543 * invoked to help free up rwnd space for the peer. Setting this to a
3480 * lower value will cause partial deliveries 3544 * lower value will cause partial deliveries to happen more often. The
3481 * calls argument is an integer that sets or 3545 * calls argument is an integer that sets or gets the partial delivery
3482 * point. Note also that the call will fail 3546 * point. Note also that the call will fail if the user attempts to set
3483 * this value larger than the socket receive 3547 * this value larger than the socket receive buffer size.
3484 * 3548 *
3485 * Note that any single message having a leng 3549 * Note that any single message having a length smaller than or equal to
3486 * the SCTP partial delivery point will be de 3550 * the SCTP partial delivery point will be delivered in one single read
3487 * call as long as the user provided buffer i 3551 * call as long as the user provided buffer is large enough to hold the
3488 * message. 3552 * message.
3489 */ 3553 */
3490 static int sctp_setsockopt_partial_delivery_p !! 3554 static int sctp_setsockopt_partial_delivery_point(struct sock *sk,
>> 3555 char __user *optval,
3491 3556 unsigned int optlen)
3492 { 3557 {
>> 3558 u32 val;
>> 3559
3493 if (optlen != sizeof(u32)) 3560 if (optlen != sizeof(u32))
3494 return -EINVAL; 3561 return -EINVAL;
>> 3562 if (get_user(val, (int __user *)optval))
>> 3563 return -EFAULT;
3495 3564
3496 /* Note: We double the receive buffer 3565 /* Note: We double the receive buffer from what the user sets
3497 * it to be, also initial rwnd is bas 3566 * it to be, also initial rwnd is based on rcvbuf/2.
3498 */ 3567 */
3499 if (*val > (sk->sk_rcvbuf >> 1)) !! 3568 if (val > (sk->sk_rcvbuf >> 1))
3500 return -EINVAL; 3569 return -EINVAL;
3501 3570
3502 sctp_sk(sk)->pd_point = *val; !! 3571 sctp_sk(sk)->pd_point = val;
3503 3572
3504 return 0; /* is this the right error 3573 return 0; /* is this the right error code? */
3505 } 3574 }
3506 3575
3507 /* 3576 /*
3508 * 7.1.28. Set or Get the maximum burst (SCT 3577 * 7.1.28. Set or Get the maximum burst (SCTP_MAX_BURST)
3509 * 3578 *
3510 * This option will allow a user to change th 3579 * This option will allow a user to change the maximum burst of packets
3511 * that can be emitted by this association. 3580 * that can be emitted by this association. Note that the default value
3512 * is 4, and some implementations may restric 3581 * is 4, and some implementations may restrict this setting so that it
3513 * can only be lowered. 3582 * can only be lowered.
3514 * 3583 *
3515 * NOTE: This text doesn't seem right. Do th 3584 * NOTE: This text doesn't seem right. Do this on a socket basis with
3516 * future associations inheriting the socket 3585 * future associations inheriting the socket value.
3517 */ 3586 */
3518 static int sctp_setsockopt_maxburst(struct so 3587 static int sctp_setsockopt_maxburst(struct sock *sk,
3519 struct sc !! 3588 char __user *optval,
3520 unsigned 3589 unsigned int optlen)
3521 { 3590 {
3522 struct sctp_sock *sp = sctp_sk(sk); 3591 struct sctp_sock *sp = sctp_sk(sk);
>> 3592 struct sctp_assoc_value params;
3523 struct sctp_association *asoc; 3593 struct sctp_association *asoc;
3524 sctp_assoc_t assoc_id; <<
3525 u32 assoc_value; <<
3526 3594
3527 if (optlen == sizeof(int)) { 3595 if (optlen == sizeof(int)) {
3528 pr_warn_ratelimited(DEPRECATE 3596 pr_warn_ratelimited(DEPRECATED
3529 "%s (pid 3597 "%s (pid %d) "
3530 "Use of i 3598 "Use of int in max_burst socket option deprecated.\n"
3531 "Use stru 3599 "Use struct sctp_assoc_value instead\n",
3532 current-> 3600 current->comm, task_pid_nr(current));
3533 assoc_id = SCTP_FUTURE_ASSOC; !! 3601 if (copy_from_user(¶ms.assoc_value, optval, optlen))
3534 assoc_value = *((int *)params !! 3602 return -EFAULT;
>> 3603 params.assoc_id = SCTP_FUTURE_ASSOC;
3535 } else if (optlen == sizeof(struct sc 3604 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3536 assoc_id = params->assoc_id; !! 3605 if (copy_from_user(¶ms, optval, optlen))
3537 assoc_value = params->assoc_v !! 3606 return -EFAULT;
3538 } else 3607 } else
3539 return -EINVAL; 3608 return -EINVAL;
3540 3609
3541 asoc = sctp_id2assoc(sk, assoc_id); !! 3610 asoc = sctp_id2assoc(sk, params.assoc_id);
3542 if (!asoc && assoc_id > SCTP_ALL_ASSO !! 3611 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
>> 3612 sctp_style(sk, UDP))
3543 return -EINVAL; 3613 return -EINVAL;
3544 3614
3545 if (asoc) { 3615 if (asoc) {
3546 asoc->max_burst = assoc_value !! 3616 asoc->max_burst = params.assoc_value;
3547 3617
3548 return 0; 3618 return 0;
3549 } 3619 }
3550 3620
3551 if (sctp_style(sk, TCP)) 3621 if (sctp_style(sk, TCP))
3552 assoc_id = SCTP_FUTURE_ASSOC; !! 3622 params.assoc_id = SCTP_FUTURE_ASSOC;
3553 3623
3554 if (assoc_id == SCTP_FUTURE_ASSOC || !! 3624 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3555 sp->max_burst = assoc_value; !! 3625 params.assoc_id == SCTP_ALL_ASSOC)
>> 3626 sp->max_burst = params.assoc_value;
3556 3627
3557 if (assoc_id == SCTP_CURRENT_ASSOC || !! 3628 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
>> 3629 params.assoc_id == SCTP_ALL_ASSOC)
3558 list_for_each_entry(asoc, &sp 3630 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3559 asoc->max_burst = ass !! 3631 asoc->max_burst = params.assoc_value;
3560 3632
3561 return 0; 3633 return 0;
3562 } 3634 }
3563 3635
3564 /* 3636 /*
3565 * 7.1.18. Add a chunk that must be authenti 3637 * 7.1.18. Add a chunk that must be authenticated (SCTP_AUTH_CHUNK)
3566 * 3638 *
3567 * This set option adds a chunk type that the 3639 * This set option adds a chunk type that the user is requesting to be
3568 * received only in an authenticated way. Ch 3640 * received only in an authenticated way. Changes to the list of chunks
3569 * will only effect future associations on th 3641 * will only effect future associations on the socket.
3570 */ 3642 */
3571 static int sctp_setsockopt_auth_chunk(struct 3643 static int sctp_setsockopt_auth_chunk(struct sock *sk,
3572 struct !! 3644 char __user *optval,
3573 unsigne 3645 unsigned int optlen)
3574 { 3646 {
3575 struct sctp_endpoint *ep = sctp_sk(sk 3647 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3648 struct sctp_authchunk val;
3576 3649
3577 if (!ep->auth_enable) 3650 if (!ep->auth_enable)
3578 return -EACCES; 3651 return -EACCES;
3579 3652
3580 if (optlen != sizeof(struct sctp_auth 3653 if (optlen != sizeof(struct sctp_authchunk))
3581 return -EINVAL; 3654 return -EINVAL;
>> 3655 if (copy_from_user(&val, optval, optlen))
>> 3656 return -EFAULT;
3582 3657
3583 switch (val->sauth_chunk) { !! 3658 switch (val.sauth_chunk) {
3584 case SCTP_CID_INIT: 3659 case SCTP_CID_INIT:
3585 case SCTP_CID_INIT_ACK: 3660 case SCTP_CID_INIT_ACK:
3586 case SCTP_CID_SHUTDOWN_COMPLETE: 3661 case SCTP_CID_SHUTDOWN_COMPLETE:
3587 case SCTP_CID_AUTH: 3662 case SCTP_CID_AUTH:
3588 return -EINVAL; 3663 return -EINVAL;
3589 } 3664 }
3590 3665
3591 /* add this chunk id to the endpoint 3666 /* add this chunk id to the endpoint */
3592 return sctp_auth_ep_add_chunkid(ep, v !! 3667 return sctp_auth_ep_add_chunkid(ep, val.sauth_chunk);
3593 } 3668 }
3594 3669
3595 /* 3670 /*
3596 * 7.1.19. Get or set the list of supported 3671 * 7.1.19. Get or set the list of supported HMAC Identifiers (SCTP_HMAC_IDENT)
3597 * 3672 *
3598 * This option gets or sets the list of HMAC 3673 * This option gets or sets the list of HMAC algorithms that the local
3599 * endpoint requires the peer to use. 3674 * endpoint requires the peer to use.
3600 */ 3675 */
3601 static int sctp_setsockopt_hmac_ident(struct 3676 static int sctp_setsockopt_hmac_ident(struct sock *sk,
3602 struct !! 3677 char __user *optval,
3603 unsigne 3678 unsigned int optlen)
3604 { 3679 {
3605 struct sctp_endpoint *ep = sctp_sk(sk 3680 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3681 struct sctp_hmacalgo *hmacs;
3606 u32 idents; 3682 u32 idents;
>> 3683 int err;
3607 3684
3608 if (!ep->auth_enable) 3685 if (!ep->auth_enable)
3609 return -EACCES; 3686 return -EACCES;
3610 3687
3611 if (optlen < sizeof(struct sctp_hmaca 3688 if (optlen < sizeof(struct sctp_hmacalgo))
3612 return -EINVAL; 3689 return -EINVAL;
3613 optlen = min_t(unsigned int, optlen, 3690 optlen = min_t(unsigned int, optlen, sizeof(struct sctp_hmacalgo) +
3614 3691 SCTP_AUTH_NUM_HMACS * sizeof(u16));
3615 3692
>> 3693 hmacs = memdup_user(optval, optlen);
>> 3694 if (IS_ERR(hmacs))
>> 3695 return PTR_ERR(hmacs);
>> 3696
3616 idents = hmacs->shmac_num_idents; 3697 idents = hmacs->shmac_num_idents;
3617 if (idents == 0 || idents > SCTP_AUTH 3698 if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
3618 (idents * sizeof(u16)) > (optlen !! 3699 (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) {
3619 return -EINVAL; !! 3700 err = -EINVAL;
>> 3701 goto out;
>> 3702 }
3620 3703
3621 return sctp_auth_ep_set_hmacs(ep, hma !! 3704 err = sctp_auth_ep_set_hmacs(ep, hmacs);
>> 3705 out:
>> 3706 kfree(hmacs);
>> 3707 return err;
3622 } 3708 }
3623 3709
3624 /* 3710 /*
3625 * 7.1.20. Set a shared key (SCTP_AUTH_KEY) 3711 * 7.1.20. Set a shared key (SCTP_AUTH_KEY)
3626 * 3712 *
3627 * This option will set a shared secret key w 3713 * This option will set a shared secret key which is used to build an
3628 * association shared key. 3714 * association shared key.
3629 */ 3715 */
3630 static int sctp_setsockopt_auth_key(struct so 3716 static int sctp_setsockopt_auth_key(struct sock *sk,
3631 struct sc !! 3717 char __user *optval,
3632 unsigned 3718 unsigned int optlen)
3633 { 3719 {
3634 struct sctp_endpoint *ep = sctp_sk(sk 3720 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 3721 struct sctp_authkey *authkey;
3635 struct sctp_association *asoc; 3722 struct sctp_association *asoc;
3636 int ret = -EINVAL; 3723 int ret = -EINVAL;
3637 3724
3638 if (optlen <= sizeof(struct sctp_auth 3725 if (optlen <= sizeof(struct sctp_authkey))
3639 return -EINVAL; 3726 return -EINVAL;
3640 /* authkey->sca_keylength is u16, so 3727 /* authkey->sca_keylength is u16, so optlen can't be bigger than
3641 * this. 3728 * this.
3642 */ 3729 */
3643 optlen = min_t(unsigned int, optlen, 3730 optlen = min_t(unsigned int, optlen, USHRT_MAX + sizeof(*authkey));
3644 3731
>> 3732 authkey = memdup_user(optval, optlen);
>> 3733 if (IS_ERR(authkey))
>> 3734 return PTR_ERR(authkey);
>> 3735
3645 if (authkey->sca_keylength > optlen - 3736 if (authkey->sca_keylength > optlen - sizeof(*authkey))
3646 goto out; 3737 goto out;
3647 3738
3648 asoc = sctp_id2assoc(sk, authkey->sca 3739 asoc = sctp_id2assoc(sk, authkey->sca_assoc_id);
3649 if (!asoc && authkey->sca_assoc_id > 3740 if (!asoc && authkey->sca_assoc_id > SCTP_ALL_ASSOC &&
3650 sctp_style(sk, UDP)) 3741 sctp_style(sk, UDP))
3651 goto out; 3742 goto out;
3652 3743
3653 if (asoc) { 3744 if (asoc) {
3654 ret = sctp_auth_set_key(ep, a 3745 ret = sctp_auth_set_key(ep, asoc, authkey);
3655 goto out; 3746 goto out;
3656 } 3747 }
3657 3748
3658 if (sctp_style(sk, TCP)) 3749 if (sctp_style(sk, TCP))
3659 authkey->sca_assoc_id = SCTP_ 3750 authkey->sca_assoc_id = SCTP_FUTURE_ASSOC;
3660 3751
3661 if (authkey->sca_assoc_id == SCTP_FUT 3752 if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC ||
3662 authkey->sca_assoc_id == SCTP_ALL 3753 authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
3663 ret = sctp_auth_set_key(ep, a 3754 ret = sctp_auth_set_key(ep, asoc, authkey);
3664 if (ret) 3755 if (ret)
3665 goto out; 3756 goto out;
3666 } 3757 }
3667 3758
3668 ret = 0; 3759 ret = 0;
3669 3760
3670 if (authkey->sca_assoc_id == SCTP_CUR 3761 if (authkey->sca_assoc_id == SCTP_CURRENT_ASSOC ||
3671 authkey->sca_assoc_id == SCTP_ALL 3762 authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
3672 list_for_each_entry(asoc, &ep 3763 list_for_each_entry(asoc, &ep->asocs, asocs) {
3673 int res = sctp_auth_s 3764 int res = sctp_auth_set_key(ep, asoc, authkey);
3674 3765
3675 if (res && !ret) 3766 if (res && !ret)
3676 ret = res; 3767 ret = res;
3677 } 3768 }
3678 } 3769 }
3679 3770
3680 out: 3771 out:
3681 memzero_explicit(authkey, optlen); !! 3772 kzfree(authkey);
3682 return ret; 3773 return ret;
3683 } 3774 }
3684 3775
3685 /* 3776 /*
3686 * 7.1.21. Get or set the active shared key 3777 * 7.1.21. Get or set the active shared key (SCTP_AUTH_ACTIVE_KEY)
3687 * 3778 *
3688 * This option will get or set the active sha 3779 * This option will get or set the active shared key to be used to build
3689 * the association shared key. 3780 * the association shared key.
3690 */ 3781 */
3691 static int sctp_setsockopt_active_key(struct 3782 static int sctp_setsockopt_active_key(struct sock *sk,
3692 struct !! 3783 char __user *optval,
3693 unsigne 3784 unsigned int optlen)
3694 { 3785 {
3695 struct sctp_endpoint *ep = sctp_sk(sk 3786 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3696 struct sctp_association *asoc; 3787 struct sctp_association *asoc;
>> 3788 struct sctp_authkeyid val;
3697 int ret = 0; 3789 int ret = 0;
3698 3790
3699 if (optlen != sizeof(struct sctp_auth 3791 if (optlen != sizeof(struct sctp_authkeyid))
3700 return -EINVAL; 3792 return -EINVAL;
>> 3793 if (copy_from_user(&val, optval, optlen))
>> 3794 return -EFAULT;
3701 3795
3702 asoc = sctp_id2assoc(sk, val->scact_a !! 3796 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3703 if (!asoc && val->scact_assoc_id > SC !! 3797 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3704 sctp_style(sk, UDP)) 3798 sctp_style(sk, UDP))
3705 return -EINVAL; 3799 return -EINVAL;
3706 3800
3707 if (asoc) 3801 if (asoc)
3708 return sctp_auth_set_active_k !! 3802 return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3709 3803
3710 if (sctp_style(sk, TCP)) 3804 if (sctp_style(sk, TCP))
3711 val->scact_assoc_id = SCTP_FU !! 3805 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3712 3806
3713 if (val->scact_assoc_id == SCTP_FUTUR !! 3807 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3714 val->scact_assoc_id == SCTP_ALL_A !! 3808 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3715 ret = sctp_auth_set_active_ke !! 3809 ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3716 if (ret) 3810 if (ret)
3717 return ret; 3811 return ret;
3718 } 3812 }
3719 3813
3720 if (val->scact_assoc_id == SCTP_CURRE !! 3814 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3721 val->scact_assoc_id == SCTP_ALL_A !! 3815 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3722 list_for_each_entry(asoc, &ep 3816 list_for_each_entry(asoc, &ep->asocs, asocs) {
3723 int res = sctp_auth_s 3817 int res = sctp_auth_set_active_key(ep, asoc,
3724 !! 3818 val.scact_keynumber);
3725 3819
3726 if (res && !ret) 3820 if (res && !ret)
3727 ret = res; 3821 ret = res;
3728 } 3822 }
3729 } 3823 }
3730 3824
3731 return ret; 3825 return ret;
3732 } 3826 }
3733 3827
3734 /* 3828 /*
3735 * 7.1.22. Delete a shared key (SCTP_AUTH_DE 3829 * 7.1.22. Delete a shared key (SCTP_AUTH_DELETE_KEY)
3736 * 3830 *
3737 * This set option will delete a shared secre 3831 * This set option will delete a shared secret key from use.
3738 */ 3832 */
3739 static int sctp_setsockopt_del_key(struct soc 3833 static int sctp_setsockopt_del_key(struct sock *sk,
3740 struct sct !! 3834 char __user *optval,
3741 unsigned i 3835 unsigned int optlen)
3742 { 3836 {
3743 struct sctp_endpoint *ep = sctp_sk(sk 3837 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3744 struct sctp_association *asoc; 3838 struct sctp_association *asoc;
>> 3839 struct sctp_authkeyid val;
3745 int ret = 0; 3840 int ret = 0;
3746 3841
3747 if (optlen != sizeof(struct sctp_auth 3842 if (optlen != sizeof(struct sctp_authkeyid))
3748 return -EINVAL; 3843 return -EINVAL;
>> 3844 if (copy_from_user(&val, optval, optlen))
>> 3845 return -EFAULT;
3749 3846
3750 asoc = sctp_id2assoc(sk, val->scact_a !! 3847 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3751 if (!asoc && val->scact_assoc_id > SC !! 3848 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3752 sctp_style(sk, UDP)) 3849 sctp_style(sk, UDP))
3753 return -EINVAL; 3850 return -EINVAL;
3754 3851
3755 if (asoc) 3852 if (asoc)
3756 return sctp_auth_del_key_id(e !! 3853 return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3757 3854
3758 if (sctp_style(sk, TCP)) 3855 if (sctp_style(sk, TCP))
3759 val->scact_assoc_id = SCTP_FU !! 3856 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3760 3857
3761 if (val->scact_assoc_id == SCTP_FUTUR !! 3858 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3762 val->scact_assoc_id == SCTP_ALL_A !! 3859 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3763 ret = sctp_auth_del_key_id(ep !! 3860 ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3764 if (ret) 3861 if (ret)
3765 return ret; 3862 return ret;
3766 } 3863 }
3767 3864
3768 if (val->scact_assoc_id == SCTP_CURRE !! 3865 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3769 val->scact_assoc_id == SCTP_ALL_A !! 3866 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3770 list_for_each_entry(asoc, &ep 3867 list_for_each_entry(asoc, &ep->asocs, asocs) {
3771 int res = sctp_auth_d 3868 int res = sctp_auth_del_key_id(ep, asoc,
3772 !! 3869 val.scact_keynumber);
3773 3870
3774 if (res && !ret) 3871 if (res && !ret)
3775 ret = res; 3872 ret = res;
3776 } 3873 }
3777 } 3874 }
3778 3875
3779 return ret; 3876 return ret;
3780 } 3877 }
3781 3878
3782 /* 3879 /*
3783 * 8.3.4 Deactivate a Shared Key (SCTP_AUTH_ 3880 * 8.3.4 Deactivate a Shared Key (SCTP_AUTH_DEACTIVATE_KEY)
3784 * 3881 *
3785 * This set option will deactivate a shared s 3882 * This set option will deactivate a shared secret key.
3786 */ 3883 */
3787 static int sctp_setsockopt_deactivate_key(str !! 3884 static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval,
3788 str <<
3789 uns 3885 unsigned int optlen)
3790 { 3886 {
3791 struct sctp_endpoint *ep = sctp_sk(sk 3887 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3792 struct sctp_association *asoc; 3888 struct sctp_association *asoc;
>> 3889 struct sctp_authkeyid val;
3793 int ret = 0; 3890 int ret = 0;
3794 3891
3795 if (optlen != sizeof(struct sctp_auth 3892 if (optlen != sizeof(struct sctp_authkeyid))
3796 return -EINVAL; 3893 return -EINVAL;
>> 3894 if (copy_from_user(&val, optval, optlen))
>> 3895 return -EFAULT;
3797 3896
3798 asoc = sctp_id2assoc(sk, val->scact_a !! 3897 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3799 if (!asoc && val->scact_assoc_id > SC !! 3898 if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3800 sctp_style(sk, UDP)) 3899 sctp_style(sk, UDP))
3801 return -EINVAL; 3900 return -EINVAL;
3802 3901
3803 if (asoc) 3902 if (asoc)
3804 return sctp_auth_deact_key_id !! 3903 return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3805 3904
3806 if (sctp_style(sk, TCP)) 3905 if (sctp_style(sk, TCP))
3807 val->scact_assoc_id = SCTP_FU !! 3906 val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3808 3907
3809 if (val->scact_assoc_id == SCTP_FUTUR !! 3908 if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3810 val->scact_assoc_id == SCTP_ALL_A !! 3909 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3811 ret = sctp_auth_deact_key_id( !! 3910 ret = sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3812 if (ret) 3911 if (ret)
3813 return ret; 3912 return ret;
3814 } 3913 }
3815 3914
3816 if (val->scact_assoc_id == SCTP_CURRE !! 3915 if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3817 val->scact_assoc_id == SCTP_ALL_A !! 3916 val.scact_assoc_id == SCTP_ALL_ASSOC) {
3818 list_for_each_entry(asoc, &ep 3917 list_for_each_entry(asoc, &ep->asocs, asocs) {
3819 int res = sctp_auth_d 3918 int res = sctp_auth_deact_key_id(ep, asoc,
3820 !! 3919 val.scact_keynumber);
3821 3920
3822 if (res && !ret) 3921 if (res && !ret)
3823 ret = res; 3922 ret = res;
3824 } 3923 }
3825 } 3924 }
3826 3925
3827 return ret; 3926 return ret;
3828 } 3927 }
3829 3928
3830 /* 3929 /*
3831 * 8.1.23 SCTP_AUTO_ASCONF 3930 * 8.1.23 SCTP_AUTO_ASCONF
3832 * 3931 *
3833 * This option will enable or disable the use 3932 * This option will enable or disable the use of the automatic generation of
3834 * ASCONF chunks to add and delete addresses 3933 * ASCONF chunks to add and delete addresses to an existing association. Note
3835 * that this option has two caveats namely: a 3934 * that this option has two caveats namely: a) it only affects sockets that
3836 * are bound to all addresses available to th 3935 * are bound to all addresses available to the SCTP stack, and b) the system
3837 * administrator may have an overriding contr 3936 * administrator may have an overriding control that turns the ASCONF feature
3838 * off no matter what setting the socket opti 3937 * off no matter what setting the socket option may have.
3839 * This option expects an integer boolean fla 3938 * This option expects an integer boolean flag, where a non-zero value turns on
3840 * the option, and a zero value turns off the 3939 * the option, and a zero value turns off the option.
3841 * Note. In this implementation, socket opera 3940 * Note. In this implementation, socket operation overrides default parameter
3842 * being set by sysctl as well as FreeBSD imp 3941 * being set by sysctl as well as FreeBSD implementation
3843 */ 3942 */
3844 static int sctp_setsockopt_auto_asconf(struct !! 3943 static int sctp_setsockopt_auto_asconf(struct sock *sk, char __user *optval,
3845 unsig 3944 unsigned int optlen)
3846 { 3945 {
>> 3946 int val;
3847 struct sctp_sock *sp = sctp_sk(sk); 3947 struct sctp_sock *sp = sctp_sk(sk);
3848 3948
3849 if (optlen < sizeof(int)) 3949 if (optlen < sizeof(int))
3850 return -EINVAL; 3950 return -EINVAL;
3851 if (!sctp_is_ep_boundall(sk) && *val) !! 3951 if (get_user(val, (int __user *)optval))
>> 3952 return -EFAULT;
>> 3953 if (!sctp_is_ep_boundall(sk) && val)
3852 return -EINVAL; 3954 return -EINVAL;
3853 if ((*val && sp->do_auto_asconf) || ( !! 3955 if ((val && sp->do_auto_asconf) || (!val && !sp->do_auto_asconf))
3854 return 0; 3956 return 0;
3855 3957
3856 spin_lock_bh(&sock_net(sk)->sctp.addr 3958 spin_lock_bh(&sock_net(sk)->sctp.addr_wq_lock);
3857 if (*val == 0 && sp->do_auto_asconf) !! 3959 if (val == 0 && sp->do_auto_asconf) {
3858 list_del(&sp->auto_asconf_lis 3960 list_del(&sp->auto_asconf_list);
3859 sp->do_auto_asconf = 0; 3961 sp->do_auto_asconf = 0;
3860 } else if (*val && !sp->do_auto_ascon !! 3962 } else if (val && !sp->do_auto_asconf) {
3861 list_add_tail(&sp->auto_ascon 3963 list_add_tail(&sp->auto_asconf_list,
3862 &sock_net(sk)->sctp.auto_ 3964 &sock_net(sk)->sctp.auto_asconf_splist);
3863 sp->do_auto_asconf = 1; 3965 sp->do_auto_asconf = 1;
3864 } 3966 }
3865 spin_unlock_bh(&sock_net(sk)->sctp.ad 3967 spin_unlock_bh(&sock_net(sk)->sctp.addr_wq_lock);
3866 return 0; 3968 return 0;
3867 } 3969 }
3868 3970
3869 /* 3971 /*
3870 * SCTP_PEER_ADDR_THLDS 3972 * SCTP_PEER_ADDR_THLDS
3871 * 3973 *
3872 * This option allows us to alter the partial 3974 * This option allows us to alter the partially failed threshold for one or all
3873 * transports in an association. See Section 3975 * transports in an association. See Section 6.1 of:
3874 * http://www.ietf.org/id/draft-nishida-tsvwg 3976 * http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
3875 */ 3977 */
3876 static int sctp_setsockopt_paddr_thresholds(s 3978 static int sctp_setsockopt_paddr_thresholds(struct sock *sk,
3877 s !! 3979 char __user *optval,
3878 u !! 3980 unsigned int optlen)
3879 { 3981 {
>> 3982 struct sctp_paddrthlds val;
3880 struct sctp_transport *trans; 3983 struct sctp_transport *trans;
3881 struct sctp_association *asoc; 3984 struct sctp_association *asoc;
3882 int len; <<
3883 <<
3884 len = v2 ? sizeof(*val) : sizeof(stru <<
3885 if (optlen < len) <<
3886 return -EINVAL; <<
3887 3985
3888 if (v2 && val->spt_pathpfthld > val-> !! 3986 if (optlen < sizeof(struct sctp_paddrthlds))
3889 return -EINVAL; 3987 return -EINVAL;
>> 3988 if (copy_from_user(&val, (struct sctp_paddrthlds __user *)optval,
>> 3989 sizeof(struct sctp_paddrthlds)))
>> 3990 return -EFAULT;
3890 3991
3891 if (!sctp_is_any(sk, (const union sct !! 3992 if (!sctp_is_any(sk, (const union sctp_addr *)&val.spt_address)) {
3892 trans = sctp_addr_id2transpor !! 3993 trans = sctp_addr_id2transport(sk, &val.spt_address,
3893 !! 3994 val.spt_assoc_id);
3894 if (!trans) 3995 if (!trans)
3895 return -ENOENT; 3996 return -ENOENT;
3896 3997
3897 if (val->spt_pathmaxrxt) !! 3998 if (val.spt_pathmaxrxt)
3898 trans->pathmaxrxt = v !! 3999 trans->pathmaxrxt = val.spt_pathmaxrxt;
3899 if (v2) !! 4000 trans->pf_retrans = val.spt_pathpfthld;
3900 trans->ps_retrans = v <<
3901 trans->pf_retrans = val->spt_ <<
3902 4001
3903 return 0; 4002 return 0;
3904 } 4003 }
3905 4004
3906 asoc = sctp_id2assoc(sk, val->spt_ass !! 4005 asoc = sctp_id2assoc(sk, val.spt_assoc_id);
3907 if (!asoc && val->spt_assoc_id != SCT !! 4006 if (!asoc && val.spt_assoc_id != SCTP_FUTURE_ASSOC &&
3908 sctp_style(sk, UDP)) 4007 sctp_style(sk, UDP))
3909 return -EINVAL; 4008 return -EINVAL;
3910 4009
3911 if (asoc) { 4010 if (asoc) {
3912 list_for_each_entry(trans, &a 4011 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
3913 transport 4012 transports) {
3914 if (val->spt_pathmaxr !! 4013 if (val.spt_pathmaxrxt)
3915 trans->pathma !! 4014 trans->pathmaxrxt = val.spt_pathmaxrxt;
3916 if (v2) !! 4015 trans->pf_retrans = val.spt_pathpfthld;
3917 trans->ps_ret <<
3918 trans->pf_retrans = v <<
3919 } 4016 }
3920 4017
3921 if (val->spt_pathmaxrxt) !! 4018 if (val.spt_pathmaxrxt)
3922 asoc->pathmaxrxt = va !! 4019 asoc->pathmaxrxt = val.spt_pathmaxrxt;
3923 if (v2) !! 4020 asoc->pf_retrans = val.spt_pathpfthld;
3924 asoc->ps_retrans = va <<
3925 asoc->pf_retrans = val->spt_p <<
3926 } else { 4021 } else {
3927 struct sctp_sock *sp = sctp_s 4022 struct sctp_sock *sp = sctp_sk(sk);
3928 4023
3929 if (val->spt_pathmaxrxt) !! 4024 if (val.spt_pathmaxrxt)
3930 sp->pathmaxrxt = val- !! 4025 sp->pathmaxrxt = val.spt_pathmaxrxt;
3931 if (v2) !! 4026 sp->pf_retrans = val.spt_pathpfthld;
3932 sp->ps_retrans = val- <<
3933 sp->pf_retrans = val->spt_pat <<
3934 } 4027 }
3935 4028
3936 return 0; 4029 return 0;
3937 } 4030 }
3938 4031
3939 static int sctp_setsockopt_recvrcvinfo(struct !! 4032 static int sctp_setsockopt_recvrcvinfo(struct sock *sk,
>> 4033 char __user *optval,
3940 unsign 4034 unsigned int optlen)
3941 { 4035 {
>> 4036 int val;
>> 4037
3942 if (optlen < sizeof(int)) 4038 if (optlen < sizeof(int))
3943 return -EINVAL; 4039 return -EINVAL;
>> 4040 if (get_user(val, (int __user *) optval))
>> 4041 return -EFAULT;
3944 4042
3945 sctp_sk(sk)->recvrcvinfo = (*val == 0 !! 4043 sctp_sk(sk)->recvrcvinfo = (val == 0) ? 0 : 1;
3946 4044
3947 return 0; 4045 return 0;
3948 } 4046 }
3949 4047
3950 static int sctp_setsockopt_recvnxtinfo(struct !! 4048 static int sctp_setsockopt_recvnxtinfo(struct sock *sk,
>> 4049 char __user *optval,
3951 unsign 4050 unsigned int optlen)
3952 { 4051 {
>> 4052 int val;
>> 4053
3953 if (optlen < sizeof(int)) 4054 if (optlen < sizeof(int))
3954 return -EINVAL; 4055 return -EINVAL;
>> 4056 if (get_user(val, (int __user *) optval))
>> 4057 return -EFAULT;
3955 4058
3956 sctp_sk(sk)->recvnxtinfo = (*val == 0 !! 4059 sctp_sk(sk)->recvnxtinfo = (val == 0) ? 0 : 1;
3957 4060
3958 return 0; 4061 return 0;
3959 } 4062 }
3960 4063
3961 static int sctp_setsockopt_pr_supported(struc 4064 static int sctp_setsockopt_pr_supported(struct sock *sk,
3962 struc !! 4065 char __user *optval,
3963 unsig 4066 unsigned int optlen)
3964 { 4067 {
>> 4068 struct sctp_assoc_value params;
3965 struct sctp_association *asoc; 4069 struct sctp_association *asoc;
3966 4070
3967 if (optlen != sizeof(*params)) !! 4071 if (optlen != sizeof(params))
3968 return -EINVAL; 4072 return -EINVAL;
3969 4073
3970 asoc = sctp_id2assoc(sk, params->asso !! 4074 if (copy_from_user(¶ms, optval, optlen))
3971 if (!asoc && params->assoc_id != SCTP !! 4075 return -EFAULT;
>> 4076
>> 4077 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4078 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3972 sctp_style(sk, UDP)) 4079 sctp_style(sk, UDP))
3973 return -EINVAL; 4080 return -EINVAL;
3974 4081
3975 sctp_sk(sk)->ep->prsctp_enable = !!pa !! 4082 sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value;
3976 4083
3977 return 0; 4084 return 0;
3978 } 4085 }
3979 4086
3980 static int sctp_setsockopt_default_prinfo(str 4087 static int sctp_setsockopt_default_prinfo(struct sock *sk,
3981 str !! 4088 char __user *optval,
3982 uns 4089 unsigned int optlen)
3983 { 4090 {
3984 struct sctp_sock *sp = sctp_sk(sk); 4091 struct sctp_sock *sp = sctp_sk(sk);
>> 4092 struct sctp_default_prinfo info;
3985 struct sctp_association *asoc; 4093 struct sctp_association *asoc;
3986 int retval = -EINVAL; 4094 int retval = -EINVAL;
3987 4095
3988 if (optlen != sizeof(*info)) !! 4096 if (optlen != sizeof(info))
3989 goto out; 4097 goto out;
3990 4098
3991 if (info->pr_policy & ~SCTP_PR_SCTP_M !! 4099 if (copy_from_user(&info, optval, sizeof(info))) {
>> 4100 retval = -EFAULT;
3992 goto out; 4101 goto out;
>> 4102 }
3993 4103
3994 if (info->pr_policy == SCTP_PR_SCTP_N !! 4104 if (info.pr_policy & ~SCTP_PR_SCTP_MASK)
3995 info->pr_value = 0; !! 4105 goto out;
>> 4106
>> 4107 if (info.pr_policy == SCTP_PR_SCTP_NONE)
>> 4108 info.pr_value = 0;
3996 4109
3997 asoc = sctp_id2assoc(sk, info->pr_ass !! 4110 asoc = sctp_id2assoc(sk, info.pr_assoc_id);
3998 if (!asoc && info->pr_assoc_id > SCTP !! 4111 if (!asoc && info.pr_assoc_id > SCTP_ALL_ASSOC &&
3999 sctp_style(sk, UDP)) 4112 sctp_style(sk, UDP))
4000 goto out; 4113 goto out;
4001 4114
4002 retval = 0; 4115 retval = 0;
4003 4116
4004 if (asoc) { 4117 if (asoc) {
4005 SCTP_PR_SET_POLICY(asoc->defa !! 4118 SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4006 asoc->default_timetolive = in !! 4119 asoc->default_timetolive = info.pr_value;
4007 goto out; 4120 goto out;
4008 } 4121 }
4009 4122
4010 if (sctp_style(sk, TCP)) 4123 if (sctp_style(sk, TCP))
4011 info->pr_assoc_id = SCTP_FUTU !! 4124 info.pr_assoc_id = SCTP_FUTURE_ASSOC;
4012 4125
4013 if (info->pr_assoc_id == SCTP_FUTURE_ !! 4126 if (info.pr_assoc_id == SCTP_FUTURE_ASSOC ||
4014 info->pr_assoc_id == SCTP_ALL_ASS !! 4127 info.pr_assoc_id == SCTP_ALL_ASSOC) {
4015 SCTP_PR_SET_POLICY(sp->defaul !! 4128 SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy);
4016 sp->default_timetolive = info !! 4129 sp->default_timetolive = info.pr_value;
4017 } 4130 }
4018 4131
4019 if (info->pr_assoc_id == SCTP_CURRENT !! 4132 if (info.pr_assoc_id == SCTP_CURRENT_ASSOC ||
4020 info->pr_assoc_id == SCTP_ALL_ASS !! 4133 info.pr_assoc_id == SCTP_ALL_ASSOC) {
4021 list_for_each_entry(asoc, &sp 4134 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4022 SCTP_PR_SET_POLICY(as !! 4135 SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4023 in !! 4136 asoc->default_timetolive = info.pr_value;
4024 asoc->default_timetol <<
4025 } 4137 }
4026 } 4138 }
4027 4139
4028 out: 4140 out:
4029 return retval; 4141 return retval;
4030 } 4142 }
4031 4143
4032 static int sctp_setsockopt_reconfig_supported 4144 static int sctp_setsockopt_reconfig_supported(struct sock *sk,
4033 !! 4145 char __user *optval,
4034 4146 unsigned int optlen)
4035 { 4147 {
>> 4148 struct sctp_assoc_value params;
4036 struct sctp_association *asoc; 4149 struct sctp_association *asoc;
4037 int retval = -EINVAL; 4150 int retval = -EINVAL;
4038 4151
4039 if (optlen != sizeof(*params)) !! 4152 if (optlen != sizeof(params))
4040 goto out; 4153 goto out;
4041 4154
4042 asoc = sctp_id2assoc(sk, params->asso !! 4155 if (copy_from_user(¶ms, optval, optlen)) {
4043 if (!asoc && params->assoc_id != SCTP !! 4156 retval = -EFAULT;
>> 4157 goto out;
>> 4158 }
>> 4159
>> 4160 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4161 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4044 sctp_style(sk, UDP)) 4162 sctp_style(sk, UDP))
4045 goto out; 4163 goto out;
4046 4164
4047 sctp_sk(sk)->ep->reconf_enable = !!pa !! 4165 sctp_sk(sk)->ep->reconf_enable = !!params.assoc_value;
4048 4166
4049 retval = 0; 4167 retval = 0;
4050 4168
4051 out: 4169 out:
4052 return retval; 4170 return retval;
4053 } 4171 }
4054 4172
4055 static int sctp_setsockopt_enable_strreset(st 4173 static int sctp_setsockopt_enable_strreset(struct sock *sk,
4056 st !! 4174 char __user *optval,
4057 un 4175 unsigned int optlen)
4058 { 4176 {
4059 struct sctp_endpoint *ep = sctp_sk(sk 4177 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
>> 4178 struct sctp_assoc_value params;
4060 struct sctp_association *asoc; 4179 struct sctp_association *asoc;
4061 int retval = -EINVAL; 4180 int retval = -EINVAL;
4062 4181
4063 if (optlen != sizeof(*params)) !! 4182 if (optlen != sizeof(params))
>> 4183 goto out;
>> 4184
>> 4185 if (copy_from_user(¶ms, optval, optlen)) {
>> 4186 retval = -EFAULT;
4064 goto out; 4187 goto out;
>> 4188 }
4065 4189
4066 if (params->assoc_value & (~SCTP_ENAB !! 4190 if (params.assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
4067 goto out; 4191 goto out;
4068 4192
4069 asoc = sctp_id2assoc(sk, params->asso !! 4193 asoc = sctp_id2assoc(sk, params.assoc_id);
4070 if (!asoc && params->assoc_id > SCTP_ !! 4194 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4071 sctp_style(sk, UDP)) 4195 sctp_style(sk, UDP))
4072 goto out; 4196 goto out;
4073 4197
4074 retval = 0; 4198 retval = 0;
4075 4199
4076 if (asoc) { 4200 if (asoc) {
4077 asoc->strreset_enable = param !! 4201 asoc->strreset_enable = params.assoc_value;
4078 goto out; 4202 goto out;
4079 } 4203 }
4080 4204
4081 if (sctp_style(sk, TCP)) 4205 if (sctp_style(sk, TCP))
4082 params->assoc_id = SCTP_FUTUR !! 4206 params.assoc_id = SCTP_FUTURE_ASSOC;
4083 4207
4084 if (params->assoc_id == SCTP_FUTURE_A !! 4208 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4085 params->assoc_id == SCTP_ALL_ASSO !! 4209 params.assoc_id == SCTP_ALL_ASSOC)
4086 ep->strreset_enable = params- !! 4210 ep->strreset_enable = params.assoc_value;
4087 4211
4088 if (params->assoc_id == SCTP_CURRENT_ !! 4212 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4089 params->assoc_id == SCTP_ALL_ASSO !! 4213 params.assoc_id == SCTP_ALL_ASSOC)
4090 list_for_each_entry(asoc, &ep 4214 list_for_each_entry(asoc, &ep->asocs, asocs)
4091 asoc->strreset_enable !! 4215 asoc->strreset_enable = params.assoc_value;
4092 4216
4093 out: 4217 out:
4094 return retval; 4218 return retval;
4095 } 4219 }
4096 4220
4097 static int sctp_setsockopt_reset_streams(stru 4221 static int sctp_setsockopt_reset_streams(struct sock *sk,
4098 stru !! 4222 char __user *optval,
4099 unsi 4223 unsigned int optlen)
4100 { 4224 {
>> 4225 struct sctp_reset_streams *params;
4101 struct sctp_association *asoc; 4226 struct sctp_association *asoc;
>> 4227 int retval = -EINVAL;
4102 4228
4103 if (optlen < sizeof(*params)) 4229 if (optlen < sizeof(*params))
4104 return -EINVAL; 4230 return -EINVAL;
4105 /* srs_number_streams is u16, so optl 4231 /* srs_number_streams is u16, so optlen can't be bigger than this. */
4106 optlen = min_t(unsigned int, optlen, 4232 optlen = min_t(unsigned int, optlen, USHRT_MAX +
4107 4233 sizeof(__u16) * sizeof(*params));
4108 4234
>> 4235 params = memdup_user(optval, optlen);
>> 4236 if (IS_ERR(params))
>> 4237 return PTR_ERR(params);
>> 4238
4109 if (params->srs_number_streams * size 4239 if (params->srs_number_streams * sizeof(__u16) >
4110 optlen - sizeof(*params)) 4240 optlen - sizeof(*params))
4111 return -EINVAL; !! 4241 goto out;
4112 4242
4113 asoc = sctp_id2assoc(sk, params->srs_ 4243 asoc = sctp_id2assoc(sk, params->srs_assoc_id);
4114 if (!asoc) 4244 if (!asoc)
4115 return -EINVAL; !! 4245 goto out;
>> 4246
>> 4247 retval = sctp_send_reset_streams(asoc, params);
4116 4248
4117 return sctp_send_reset_streams(asoc, !! 4249 out:
>> 4250 kfree(params);
>> 4251 return retval;
4118 } 4252 }
4119 4253
4120 static int sctp_setsockopt_reset_assoc(struct !! 4254 static int sctp_setsockopt_reset_assoc(struct sock *sk,
>> 4255 char __user *optval,
4121 unsign 4256 unsigned int optlen)
4122 { 4257 {
4123 struct sctp_association *asoc; 4258 struct sctp_association *asoc;
>> 4259 sctp_assoc_t associd;
>> 4260 int retval = -EINVAL;
4124 4261
4125 if (optlen != sizeof(*associd)) !! 4262 if (optlen != sizeof(associd))
4126 return -EINVAL; !! 4263 goto out;
4127 4264
4128 asoc = sctp_id2assoc(sk, *associd); !! 4265 if (copy_from_user(&associd, optval, optlen)) {
>> 4266 retval = -EFAULT;
>> 4267 goto out;
>> 4268 }
>> 4269
>> 4270 asoc = sctp_id2assoc(sk, associd);
4129 if (!asoc) 4271 if (!asoc)
4130 return -EINVAL; !! 4272 goto out;
>> 4273
>> 4274 retval = sctp_send_reset_assoc(asoc);
4131 4275
4132 return sctp_send_reset_assoc(asoc); !! 4276 out:
>> 4277 return retval;
4133 } 4278 }
4134 4279
4135 static int sctp_setsockopt_add_streams(struct 4280 static int sctp_setsockopt_add_streams(struct sock *sk,
4136 struct !! 4281 char __user *optval,
4137 unsign 4282 unsigned int optlen)
4138 { 4283 {
4139 struct sctp_association *asoc; 4284 struct sctp_association *asoc;
>> 4285 struct sctp_add_streams params;
>> 4286 int retval = -EINVAL;
4140 4287
4141 if (optlen != sizeof(*params)) !! 4288 if (optlen != sizeof(params))
4142 return -EINVAL; !! 4289 goto out;
4143 4290
4144 asoc = sctp_id2assoc(sk, params->sas_ !! 4291 if (copy_from_user(¶ms, optval, optlen)) {
>> 4292 retval = -EFAULT;
>> 4293 goto out;
>> 4294 }
>> 4295
>> 4296 asoc = sctp_id2assoc(sk, params.sas_assoc_id);
4145 if (!asoc) 4297 if (!asoc)
4146 return -EINVAL; !! 4298 goto out;
>> 4299
>> 4300 retval = sctp_send_add_streams(asoc, ¶ms);
4147 4301
4148 return sctp_send_add_streams(asoc, pa !! 4302 out:
>> 4303 return retval;
4149 } 4304 }
4150 4305
4151 static int sctp_setsockopt_scheduler(struct s 4306 static int sctp_setsockopt_scheduler(struct sock *sk,
4152 struct s !! 4307 char __user *optval,
4153 unsigned 4308 unsigned int optlen)
4154 { 4309 {
4155 struct sctp_sock *sp = sctp_sk(sk); 4310 struct sctp_sock *sp = sctp_sk(sk);
4156 struct sctp_association *asoc; 4311 struct sctp_association *asoc;
>> 4312 struct sctp_assoc_value params;
4157 int retval = 0; 4313 int retval = 0;
4158 4314
4159 if (optlen < sizeof(*params)) !! 4315 if (optlen < sizeof(params))
4160 return -EINVAL; 4316 return -EINVAL;
4161 4317
4162 if (params->assoc_value > SCTP_SS_MAX !! 4318 optlen = sizeof(params);
>> 4319 if (copy_from_user(¶ms, optval, optlen))
>> 4320 return -EFAULT;
>> 4321
>> 4322 if (params.assoc_value > SCTP_SS_MAX)
4163 return -EINVAL; 4323 return -EINVAL;
4164 4324
4165 asoc = sctp_id2assoc(sk, params->asso !! 4325 asoc = sctp_id2assoc(sk, params.assoc_id);
4166 if (!asoc && params->assoc_id > SCTP_ !! 4326 if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4167 sctp_style(sk, UDP)) 4327 sctp_style(sk, UDP))
4168 return -EINVAL; 4328 return -EINVAL;
4169 4329
4170 if (asoc) 4330 if (asoc)
4171 return sctp_sched_set_sched(a !! 4331 return sctp_sched_set_sched(asoc, params.assoc_value);
4172 4332
4173 if (sctp_style(sk, TCP)) 4333 if (sctp_style(sk, TCP))
4174 params->assoc_id = SCTP_FUTUR !! 4334 params.assoc_id = SCTP_FUTURE_ASSOC;
4175 4335
4176 if (params->assoc_id == SCTP_FUTURE_A !! 4336 if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4177 params->assoc_id == SCTP_ALL_ASSO !! 4337 params.assoc_id == SCTP_ALL_ASSOC)
4178 sp->default_ss = params->asso !! 4338 sp->default_ss = params.assoc_value;
4179 4339
4180 if (params->assoc_id == SCTP_CURRENT_ !! 4340 if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4181 params->assoc_id == SCTP_ALL_ASSO !! 4341 params.assoc_id == SCTP_ALL_ASSOC) {
4182 list_for_each_entry(asoc, &sp 4342 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4183 int ret = sctp_sched_ 4343 int ret = sctp_sched_set_sched(asoc,
4184 !! 4344 params.assoc_value);
4185 4345
4186 if (ret && !retval) 4346 if (ret && !retval)
4187 retval = ret; 4347 retval = ret;
4188 } 4348 }
4189 } 4349 }
4190 4350
4191 return retval; 4351 return retval;
4192 } 4352 }
4193 4353
4194 static int sctp_setsockopt_scheduler_value(st 4354 static int sctp_setsockopt_scheduler_value(struct sock *sk,
4195 st !! 4355 char __user *optval,
4196 un 4356 unsigned int optlen)
4197 { 4357 {
>> 4358 struct sctp_stream_value params;
4198 struct sctp_association *asoc; 4359 struct sctp_association *asoc;
4199 int retval = -EINVAL; 4360 int retval = -EINVAL;
4200 4361
4201 if (optlen < sizeof(*params)) !! 4362 if (optlen < sizeof(params))
4202 goto out; 4363 goto out;
4203 4364
4204 asoc = sctp_id2assoc(sk, params->asso !! 4365 optlen = sizeof(params);
4205 if (!asoc && params->assoc_id != SCTP !! 4366 if (copy_from_user(¶ms, optval, optlen)) {
>> 4367 retval = -EFAULT;
>> 4368 goto out;
>> 4369 }
>> 4370
>> 4371 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4372 if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC &&
4206 sctp_style(sk, UDP)) 4373 sctp_style(sk, UDP))
4207 goto out; 4374 goto out;
4208 4375
4209 if (asoc) { 4376 if (asoc) {
4210 retval = sctp_sched_set_value !! 4377 retval = sctp_sched_set_value(asoc, params.stream_id,
4211 !! 4378 params.stream_value, GFP_KERNEL);
4212 goto out; 4379 goto out;
4213 } 4380 }
4214 4381
4215 retval = 0; 4382 retval = 0;
4216 4383
4217 list_for_each_entry(asoc, &sctp_sk(sk 4384 list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) {
4218 int ret = sctp_sched_set_valu !! 4385 int ret = sctp_sched_set_value(asoc, params.stream_id,
4219 !! 4386 params.stream_value, GFP_KERNEL);
4220 <<
4221 if (ret && !retval) /* try to 4387 if (ret && !retval) /* try to return the 1st error. */
4222 retval = ret; 4388 retval = ret;
4223 } 4389 }
4224 4390
4225 out: 4391 out:
4226 return retval; 4392 return retval;
4227 } 4393 }
4228 4394
4229 static int sctp_setsockopt_interleaving_suppo 4395 static int sctp_setsockopt_interleaving_supported(struct sock *sk,
4230 !! 4396 char __user *optval,
4231 4397 unsigned int optlen)
4232 { 4398 {
4233 struct sctp_sock *sp = sctp_sk(sk); 4399 struct sctp_sock *sp = sctp_sk(sk);
>> 4400 struct sctp_assoc_value params;
4234 struct sctp_association *asoc; 4401 struct sctp_association *asoc;
>> 4402 int retval = -EINVAL;
4235 4403
4236 if (optlen < sizeof(*p)) !! 4404 if (optlen < sizeof(params))
4237 return -EINVAL; !! 4405 goto out;
4238 4406
4239 asoc = sctp_id2assoc(sk, p->assoc_id) !! 4407 optlen = sizeof(params);
4240 if (!asoc && p->assoc_id != SCTP_FUTU !! 4408 if (copy_from_user(¶ms, optval, optlen)) {
4241 return -EINVAL; !! 4409 retval = -EFAULT;
>> 4410 goto out;
>> 4411 }
>> 4412
>> 4413 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4414 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
>> 4415 sctp_style(sk, UDP))
>> 4416 goto out;
4242 4417
4243 if (!sock_net(sk)->sctp.intl_enable | 4418 if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) {
4244 return -EPERM; !! 4419 retval = -EPERM;
>> 4420 goto out;
4245 } 4421 }
4246 4422
4247 sp->ep->intl_enable = !!p->assoc_valu !! 4423 sp->ep->intl_enable = !!params.assoc_value;
4248 return 0; !! 4424
>> 4425 retval = 0;
>> 4426
>> 4427 out:
>> 4428 return retval;
4249 } 4429 }
4250 4430
4251 static int sctp_setsockopt_reuse_port(struct !! 4431 static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval,
4252 unsigne 4432 unsigned int optlen)
4253 { 4433 {
>> 4434 int val;
>> 4435
4254 if (!sctp_style(sk, TCP)) 4436 if (!sctp_style(sk, TCP))
4255 return -EOPNOTSUPP; 4437 return -EOPNOTSUPP;
4256 4438
4257 if (sctp_sk(sk)->ep->base.bind_addr.p 4439 if (sctp_sk(sk)->ep->base.bind_addr.port)
4258 return -EFAULT; 4440 return -EFAULT;
4259 4441
4260 if (optlen < sizeof(int)) 4442 if (optlen < sizeof(int))
4261 return -EINVAL; 4443 return -EINVAL;
4262 4444
4263 sctp_sk(sk)->reuse = !!*val; !! 4445 if (get_user(val, (int __user *)optval))
>> 4446 return -EFAULT;
>> 4447
>> 4448 sctp_sk(sk)->reuse = !!val;
4264 4449
4265 return 0; 4450 return 0;
4266 } 4451 }
4267 4452
4268 static int sctp_assoc_ulpevent_type_set(struc 4453 static int sctp_assoc_ulpevent_type_set(struct sctp_event *param,
4269 struc 4454 struct sctp_association *asoc)
4270 { 4455 {
4271 struct sctp_ulpevent *event; 4456 struct sctp_ulpevent *event;
4272 4457
4273 sctp_ulpevent_type_set(&asoc->subscri 4458 sctp_ulpevent_type_set(&asoc->subscribe, param->se_type, param->se_on);
4274 4459
4275 if (param->se_type == SCTP_SENDER_DRY 4460 if (param->se_type == SCTP_SENDER_DRY_EVENT && param->se_on) {
4276 if (sctp_outq_is_empty(&asoc- 4461 if (sctp_outq_is_empty(&asoc->outqueue)) {
4277 event = sctp_ulpevent 4462 event = sctp_ulpevent_make_sender_dry_event(asoc,
4278 GFP_U 4463 GFP_USER | __GFP_NOWARN);
4279 if (!event) 4464 if (!event)
4280 return -ENOME 4465 return -ENOMEM;
4281 4466
4282 asoc->stream.si->enqu 4467 asoc->stream.si->enqueue_event(&asoc->ulpq, event);
4283 } 4468 }
4284 } 4469 }
4285 4470
4286 return 0; 4471 return 0;
4287 } 4472 }
4288 4473
4289 static int sctp_setsockopt_event(struct sock !! 4474 static int sctp_setsockopt_event(struct sock *sk, char __user *optval,
4290 unsigned int 4475 unsigned int optlen)
4291 { 4476 {
4292 struct sctp_sock *sp = sctp_sk(sk); 4477 struct sctp_sock *sp = sctp_sk(sk);
4293 struct sctp_association *asoc; 4478 struct sctp_association *asoc;
>> 4479 struct sctp_event param;
4294 int retval = 0; 4480 int retval = 0;
4295 4481
4296 if (optlen < sizeof(*param)) !! 4482 if (optlen < sizeof(param))
4297 return -EINVAL; 4483 return -EINVAL;
4298 4484
4299 if (param->se_type < SCTP_SN_TYPE_BAS !! 4485 optlen = sizeof(param);
4300 param->se_type > SCTP_SN_TYPE_MAX !! 4486 if (copy_from_user(¶m, optval, optlen))
>> 4487 return -EFAULT;
>> 4488
>> 4489 if (param.se_type < SCTP_SN_TYPE_BASE ||
>> 4490 param.se_type > SCTP_SN_TYPE_MAX)
4301 return -EINVAL; 4491 return -EINVAL;
4302 4492
4303 asoc = sctp_id2assoc(sk, param->se_as !! 4493 asoc = sctp_id2assoc(sk, param.se_assoc_id);
4304 if (!asoc && param->se_assoc_id > SCT !! 4494 if (!asoc && param.se_assoc_id > SCTP_ALL_ASSOC &&
4305 sctp_style(sk, UDP)) 4495 sctp_style(sk, UDP))
4306 return -EINVAL; 4496 return -EINVAL;
4307 4497
4308 if (asoc) 4498 if (asoc)
4309 return sctp_assoc_ulpevent_ty !! 4499 return sctp_assoc_ulpevent_type_set(¶m, asoc);
4310 4500
4311 if (sctp_style(sk, TCP)) 4501 if (sctp_style(sk, TCP))
4312 param->se_assoc_id = SCTP_FUT !! 4502 param.se_assoc_id = SCTP_FUTURE_ASSOC;
4313 4503
4314 if (param->se_assoc_id == SCTP_FUTURE !! 4504 if (param.se_assoc_id == SCTP_FUTURE_ASSOC ||
4315 param->se_assoc_id == SCTP_ALL_AS !! 4505 param.se_assoc_id == SCTP_ALL_ASSOC)
4316 sctp_ulpevent_type_set(&sp->s 4506 sctp_ulpevent_type_set(&sp->subscribe,
4317 param- !! 4507 param.se_type, param.se_on);
4318 4508
4319 if (param->se_assoc_id == SCTP_CURREN !! 4509 if (param.se_assoc_id == SCTP_CURRENT_ASSOC ||
4320 param->se_assoc_id == SCTP_ALL_AS !! 4510 param.se_assoc_id == SCTP_ALL_ASSOC) {
4321 list_for_each_entry(asoc, &sp 4511 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4322 int ret = sctp_assoc_ !! 4512 int ret = sctp_assoc_ulpevent_type_set(¶m, asoc);
4323 4513
4324 if (ret && !retval) 4514 if (ret && !retval)
4325 retval = ret; 4515 retval = ret;
4326 } 4516 }
4327 } 4517 }
4328 4518
4329 return retval; 4519 return retval;
4330 } 4520 }
4331 4521
4332 static int sctp_setsockopt_asconf_supported(s 4522 static int sctp_setsockopt_asconf_supported(struct sock *sk,
4333 s !! 4523 char __user *optval,
4334 u 4524 unsigned int optlen)
4335 { 4525 {
>> 4526 struct sctp_assoc_value params;
4336 struct sctp_association *asoc; 4527 struct sctp_association *asoc;
4337 struct sctp_endpoint *ep; 4528 struct sctp_endpoint *ep;
4338 int retval = -EINVAL; 4529 int retval = -EINVAL;
4339 4530
4340 if (optlen != sizeof(*params)) !! 4531 if (optlen != sizeof(params))
4341 goto out; 4532 goto out;
4342 4533
4343 asoc = sctp_id2assoc(sk, params->asso !! 4534 if (copy_from_user(¶ms, optval, optlen)) {
4344 if (!asoc && params->assoc_id != SCTP !! 4535 retval = -EFAULT;
>> 4536 goto out;
>> 4537 }
>> 4538
>> 4539 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4540 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4345 sctp_style(sk, UDP)) 4541 sctp_style(sk, UDP))
4346 goto out; 4542 goto out;
4347 4543
4348 ep = sctp_sk(sk)->ep; 4544 ep = sctp_sk(sk)->ep;
4349 ep->asconf_enable = !!params->assoc_v !! 4545 ep->asconf_enable = !!params.assoc_value;
4350 4546
4351 if (ep->asconf_enable && ep->auth_ena 4547 if (ep->asconf_enable && ep->auth_enable) {
4352 sctp_auth_ep_add_chunkid(ep, 4548 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
4353 sctp_auth_ep_add_chunkid(ep, 4549 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF_ACK);
4354 } 4550 }
4355 4551
4356 retval = 0; 4552 retval = 0;
4357 4553
4358 out: 4554 out:
4359 return retval; 4555 return retval;
4360 } 4556 }
4361 4557
4362 static int sctp_setsockopt_auth_supported(str 4558 static int sctp_setsockopt_auth_supported(struct sock *sk,
4363 str !! 4559 char __user *optval,
4364 uns 4560 unsigned int optlen)
4365 { 4561 {
>> 4562 struct sctp_assoc_value params;
4366 struct sctp_association *asoc; 4563 struct sctp_association *asoc;
4367 struct sctp_endpoint *ep; 4564 struct sctp_endpoint *ep;
4368 int retval = -EINVAL; 4565 int retval = -EINVAL;
4369 4566
4370 if (optlen != sizeof(*params)) !! 4567 if (optlen != sizeof(params))
4371 goto out; 4568 goto out;
4372 4569
4373 asoc = sctp_id2assoc(sk, params->asso !! 4570 if (copy_from_user(¶ms, optval, optlen)) {
4374 if (!asoc && params->assoc_id != SCTP !! 4571 retval = -EFAULT;
>> 4572 goto out;
>> 4573 }
>> 4574
>> 4575 asoc = sctp_id2assoc(sk, params.assoc_id);
>> 4576 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4375 sctp_style(sk, UDP)) 4577 sctp_style(sk, UDP))
4376 goto out; 4578 goto out;
4377 4579
4378 ep = sctp_sk(sk)->ep; 4580 ep = sctp_sk(sk)->ep;
4379 if (params->assoc_value) { !! 4581 if (params.assoc_value) {
4380 retval = sctp_auth_init(ep, G 4582 retval = sctp_auth_init(ep, GFP_KERNEL);
4381 if (retval) 4583 if (retval)
4382 goto out; 4584 goto out;
4383 if (ep->asconf_enable) { 4585 if (ep->asconf_enable) {
4384 sctp_auth_ep_add_chun 4586 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
4385 sctp_auth_ep_add_chun 4587 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF_ACK);
4386 } 4588 }
4387 } 4589 }
4388 4590
4389 ep->auth_enable = !!params->assoc_val !! 4591 ep->auth_enable = !!params.assoc_value;
4390 retval = 0; 4592 retval = 0;
4391 4593
4392 out: 4594 out:
4393 return retval; 4595 return retval;
4394 } 4596 }
4395 4597
4396 static int sctp_setsockopt_ecn_supported(stru 4598 static int sctp_setsockopt_ecn_supported(struct sock *sk,
4397 stru !! 4599 char __user *optval,
4398 unsi 4600 unsigned int optlen)
4399 { 4601 {
>> 4602 struct sctp_assoc_value params;
4400 struct sctp_association *asoc; 4603 struct sctp_association *asoc;
4401 int retval = -EINVAL; 4604 int retval = -EINVAL;
4402 4605
4403 if (optlen != sizeof(*params)) !! 4606 if (optlen != sizeof(params))
4404 goto out; <<
4405 <<
4406 asoc = sctp_id2assoc(sk, params->asso <<
4407 if (!asoc && params->assoc_id != SCTP <<
4408 sctp_style(sk, UDP)) <<
4409 goto out; <<
4410 <<
4411 sctp_sk(sk)->ep->ecn_enable = !!param <<
4412 retval = 0; <<
4413 <<
4414 out: <<
4415 return retval; <<
4416 } <<
4417 <<
4418 static int sctp_setsockopt_pf_expose(struct s <<
4419 struct s <<
4420 unsigned <<
4421 { <<
4422 struct sctp_association *asoc; <<
4423 int retval = -EINVAL; <<
4424 <<
4425 if (optlen != sizeof(*params)) <<
4426 goto out; 4607 goto out;
4427 4608
4428 if (params->assoc_value > SCTP_PF_EXP !! 4609 if (copy_from_user(¶ms, optval, optlen)) {
>> 4610 retval = -EFAULT;
4429 goto out; 4611 goto out;
>> 4612 }
4430 4613
4431 asoc = sctp_id2assoc(sk, params->asso !! 4614 asoc = sctp_id2assoc(sk, params.assoc_id);
4432 if (!asoc && params->assoc_id != SCTP !! 4615 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4433 sctp_style(sk, UDP)) 4616 sctp_style(sk, UDP))
4434 goto out; 4617 goto out;
4435 4618
4436 if (asoc) !! 4619 sctp_sk(sk)->ep->ecn_enable = !!params.assoc_value;
4437 asoc->pf_expose = params->ass <<
4438 else <<
4439 sctp_sk(sk)->pf_expose = para <<
4440 retval = 0; 4620 retval = 0;
4441 4621
4442 out: 4622 out:
4443 return retval; 4623 return retval;
4444 } 4624 }
4445 4625
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() 4626 /* API 6.2 setsockopt(), getsockopt()
4552 * 4627 *
4553 * Applications use setsockopt() and getsocko 4628 * Applications use setsockopt() and getsockopt() to set or retrieve
4554 * socket options. Socket options are used t 4629 * socket options. Socket options are used to change the default
4555 * behavior of sockets calls. They are descr 4630 * behavior of sockets calls. They are described in Section 7.
4556 * 4631 *
4557 * The syntax is: 4632 * The syntax is:
4558 * 4633 *
4559 * ret = getsockopt(int sd, int level, int 4634 * ret = getsockopt(int sd, int level, int optname, void __user *optval,
4560 * int __user *optlen); 4635 * int __user *optlen);
4561 * ret = setsockopt(int sd, int level, int 4636 * ret = setsockopt(int sd, int level, int optname, const void __user *optval,
4562 * int optlen); 4637 * int optlen);
4563 * 4638 *
4564 * sd - the socket descript. 4639 * sd - the socket descript.
4565 * level - set to IPPROTO_SCTP for all SC 4640 * level - set to IPPROTO_SCTP for all SCTP options.
4566 * optname - the option name. 4641 * optname - the option name.
4567 * optval - the buffer to store the value 4642 * optval - the buffer to store the value of the option.
4568 * optlen - the size of the buffer. 4643 * optlen - the size of the buffer.
4569 */ 4644 */
4570 static int sctp_setsockopt(struct sock *sk, i 4645 static int sctp_setsockopt(struct sock *sk, int level, int optname,
4571 sockptr_t optval, !! 4646 char __user *optval, unsigned int optlen)
4572 { 4647 {
4573 void *kopt = NULL; <<
4574 int retval = 0; 4648 int retval = 0;
4575 4649
4576 pr_debug("%s: sk:%p, optname:%d\n", _ 4650 pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
4577 4651
4578 /* I can hardly begin to describe how 4652 /* I can hardly begin to describe how wrong this is. This is
4579 * so broken as to be worse than usel 4653 * so broken as to be worse than useless. The API draft
4580 * REALLY is NOT helpful here... I a 4654 * REALLY is NOT helpful here... I am not convinced that the
4581 * semantics of setsockopt() with a l 4655 * semantics of setsockopt() with a level OTHER THAN SOL_SCTP
4582 * are at all well-founded. 4656 * are at all well-founded.
4583 */ 4657 */
4584 if (level != SOL_SCTP) { 4658 if (level != SOL_SCTP) {
4585 struct sctp_af *af = sctp_sk( 4659 struct sctp_af *af = sctp_sk(sk)->pf->af;
4586 !! 4660 retval = af->setsockopt(sk, level, optname, optval, optlen);
4587 return af->setsockopt(sk, lev !! 4661 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 } 4662 }
4599 4663
4600 lock_sock(sk); 4664 lock_sock(sk);
4601 4665
4602 switch (optname) { 4666 switch (optname) {
4603 case SCTP_SOCKOPT_BINDX_ADD: 4667 case SCTP_SOCKOPT_BINDX_ADD:
4604 /* 'optlen' is the size of th 4668 /* 'optlen' is the size of the addresses buffer. */
4605 retval = sctp_setsockopt_bind !! 4669 retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4606 !! 4670 optlen, SCTP_BINDX_ADD_ADDR);
4607 break; 4671 break;
4608 4672
4609 case SCTP_SOCKOPT_BINDX_REM: 4673 case SCTP_SOCKOPT_BINDX_REM:
4610 /* 'optlen' is the size of th 4674 /* 'optlen' is the size of the addresses buffer. */
4611 retval = sctp_setsockopt_bind !! 4675 retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4612 !! 4676 optlen, SCTP_BINDX_REM_ADDR);
4613 break; 4677 break;
4614 4678
4615 case SCTP_SOCKOPT_CONNECTX_OLD: 4679 case SCTP_SOCKOPT_CONNECTX_OLD:
4616 /* 'optlen' is the size of th 4680 /* 'optlen' is the size of the addresses buffer. */
4617 retval = sctp_setsockopt_conn !! 4681 retval = sctp_setsockopt_connectx_old(sk,
>> 4682 (struct sockaddr __user *)optval,
>> 4683 optlen);
4618 break; 4684 break;
4619 4685
4620 case SCTP_SOCKOPT_CONNECTX: 4686 case SCTP_SOCKOPT_CONNECTX:
4621 /* 'optlen' is the size of th 4687 /* 'optlen' is the size of the addresses buffer. */
4622 retval = sctp_setsockopt_conn !! 4688 retval = sctp_setsockopt_connectx(sk,
>> 4689 (struct sockaddr __user *)optval,
>> 4690 optlen);
4623 break; 4691 break;
4624 4692
4625 case SCTP_DISABLE_FRAGMENTS: 4693 case SCTP_DISABLE_FRAGMENTS:
4626 retval = sctp_setsockopt_disa !! 4694 retval = sctp_setsockopt_disable_fragments(sk, optval, optlen);
4627 break; 4695 break;
4628 4696
4629 case SCTP_EVENTS: 4697 case SCTP_EVENTS:
4630 retval = sctp_setsockopt_even !! 4698 retval = sctp_setsockopt_events(sk, optval, optlen);
4631 break; 4699 break;
4632 4700
4633 case SCTP_AUTOCLOSE: 4701 case SCTP_AUTOCLOSE:
4634 retval = sctp_setsockopt_auto !! 4702 retval = sctp_setsockopt_autoclose(sk, optval, optlen);
4635 break; 4703 break;
4636 4704
4637 case SCTP_PEER_ADDR_PARAMS: 4705 case SCTP_PEER_ADDR_PARAMS:
4638 retval = sctp_setsockopt_peer !! 4706 retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
4639 break; 4707 break;
4640 4708
4641 case SCTP_DELAYED_SACK: 4709 case SCTP_DELAYED_SACK:
4642 retval = sctp_setsockopt_dela !! 4710 retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
4643 break; 4711 break;
4644 case SCTP_PARTIAL_DELIVERY_POINT: 4712 case SCTP_PARTIAL_DELIVERY_POINT:
4645 retval = sctp_setsockopt_part !! 4713 retval = sctp_setsockopt_partial_delivery_point(sk, optval, optlen);
4646 break; 4714 break;
4647 4715
4648 case SCTP_INITMSG: 4716 case SCTP_INITMSG:
4649 retval = sctp_setsockopt_init !! 4717 retval = sctp_setsockopt_initmsg(sk, optval, optlen);
4650 break; 4718 break;
4651 case SCTP_DEFAULT_SEND_PARAM: 4719 case SCTP_DEFAULT_SEND_PARAM:
4652 retval = sctp_setsockopt_defa !! 4720 retval = sctp_setsockopt_default_send_param(sk, optval,
>> 4721 optlen);
4653 break; 4722 break;
4654 case SCTP_DEFAULT_SNDINFO: 4723 case SCTP_DEFAULT_SNDINFO:
4655 retval = sctp_setsockopt_defa !! 4724 retval = sctp_setsockopt_default_sndinfo(sk, optval, optlen);
4656 break; 4725 break;
4657 case SCTP_PRIMARY_ADDR: 4726 case SCTP_PRIMARY_ADDR:
4658 retval = sctp_setsockopt_prim !! 4727 retval = sctp_setsockopt_primary_addr(sk, optval, optlen);
4659 break; 4728 break;
4660 case SCTP_SET_PEER_PRIMARY_ADDR: 4729 case SCTP_SET_PEER_PRIMARY_ADDR:
4661 retval = sctp_setsockopt_peer !! 4730 retval = sctp_setsockopt_peer_primary_addr(sk, optval, optlen);
4662 break; 4731 break;
4663 case SCTP_NODELAY: 4732 case SCTP_NODELAY:
4664 retval = sctp_setsockopt_node !! 4733 retval = sctp_setsockopt_nodelay(sk, optval, optlen);
4665 break; 4734 break;
4666 case SCTP_RTOINFO: 4735 case SCTP_RTOINFO:
4667 retval = sctp_setsockopt_rtoi !! 4736 retval = sctp_setsockopt_rtoinfo(sk, optval, optlen);
4668 break; 4737 break;
4669 case SCTP_ASSOCINFO: 4738 case SCTP_ASSOCINFO:
4670 retval = sctp_setsockopt_asso !! 4739 retval = sctp_setsockopt_associnfo(sk, optval, optlen);
4671 break; 4740 break;
4672 case SCTP_I_WANT_MAPPED_V4_ADDR: 4741 case SCTP_I_WANT_MAPPED_V4_ADDR:
4673 retval = sctp_setsockopt_mapp !! 4742 retval = sctp_setsockopt_mappedv4(sk, optval, optlen);
4674 break; 4743 break;
4675 case SCTP_MAXSEG: 4744 case SCTP_MAXSEG:
4676 retval = sctp_setsockopt_maxs !! 4745 retval = sctp_setsockopt_maxseg(sk, optval, optlen);
4677 break; 4746 break;
4678 case SCTP_ADAPTATION_LAYER: 4747 case SCTP_ADAPTATION_LAYER:
4679 retval = sctp_setsockopt_adap !! 4748 retval = sctp_setsockopt_adaptation_layer(sk, optval, optlen);
4680 break; 4749 break;
4681 case SCTP_CONTEXT: 4750 case SCTP_CONTEXT:
4682 retval = sctp_setsockopt_cont !! 4751 retval = sctp_setsockopt_context(sk, optval, optlen);
4683 break; 4752 break;
4684 case SCTP_FRAGMENT_INTERLEAVE: 4753 case SCTP_FRAGMENT_INTERLEAVE:
4685 retval = sctp_setsockopt_frag !! 4754 retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen);
4686 break; 4755 break;
4687 case SCTP_MAX_BURST: 4756 case SCTP_MAX_BURST:
4688 retval = sctp_setsockopt_maxb !! 4757 retval = sctp_setsockopt_maxburst(sk, optval, optlen);
4689 break; 4758 break;
4690 case SCTP_AUTH_CHUNK: 4759 case SCTP_AUTH_CHUNK:
4691 retval = sctp_setsockopt_auth !! 4760 retval = sctp_setsockopt_auth_chunk(sk, optval, optlen);
4692 break; 4761 break;
4693 case SCTP_HMAC_IDENT: 4762 case SCTP_HMAC_IDENT:
4694 retval = sctp_setsockopt_hmac !! 4763 retval = sctp_setsockopt_hmac_ident(sk, optval, optlen);
4695 break; 4764 break;
4696 case SCTP_AUTH_KEY: 4765 case SCTP_AUTH_KEY:
4697 retval = sctp_setsockopt_auth !! 4766 retval = sctp_setsockopt_auth_key(sk, optval, optlen);
4698 break; 4767 break;
4699 case SCTP_AUTH_ACTIVE_KEY: 4768 case SCTP_AUTH_ACTIVE_KEY:
4700 retval = sctp_setsockopt_acti !! 4769 retval = sctp_setsockopt_active_key(sk, optval, optlen);
4701 break; 4770 break;
4702 case SCTP_AUTH_DELETE_KEY: 4771 case SCTP_AUTH_DELETE_KEY:
4703 retval = sctp_setsockopt_del_ !! 4772 retval = sctp_setsockopt_del_key(sk, optval, optlen);
4704 break; 4773 break;
4705 case SCTP_AUTH_DEACTIVATE_KEY: 4774 case SCTP_AUTH_DEACTIVATE_KEY:
4706 retval = sctp_setsockopt_deac !! 4775 retval = sctp_setsockopt_deactivate_key(sk, optval, optlen);
4707 break; 4776 break;
4708 case SCTP_AUTO_ASCONF: 4777 case SCTP_AUTO_ASCONF:
4709 retval = sctp_setsockopt_auto !! 4778 retval = sctp_setsockopt_auto_asconf(sk, optval, optlen);
4710 break; 4779 break;
4711 case SCTP_PEER_ADDR_THLDS: 4780 case SCTP_PEER_ADDR_THLDS:
4712 retval = sctp_setsockopt_padd !! 4781 retval = sctp_setsockopt_paddr_thresholds(sk, optval, optlen);
4713 <<
4714 break; <<
4715 case SCTP_PEER_ADDR_THLDS_V2: <<
4716 retval = sctp_setsockopt_padd <<
4717 <<
4718 break; 4782 break;
4719 case SCTP_RECVRCVINFO: 4783 case SCTP_RECVRCVINFO:
4720 retval = sctp_setsockopt_recv !! 4784 retval = sctp_setsockopt_recvrcvinfo(sk, optval, optlen);
4721 break; 4785 break;
4722 case SCTP_RECVNXTINFO: 4786 case SCTP_RECVNXTINFO:
4723 retval = sctp_setsockopt_recv !! 4787 retval = sctp_setsockopt_recvnxtinfo(sk, optval, optlen);
4724 break; 4788 break;
4725 case SCTP_PR_SUPPORTED: 4789 case SCTP_PR_SUPPORTED:
4726 retval = sctp_setsockopt_pr_s !! 4790 retval = sctp_setsockopt_pr_supported(sk, optval, optlen);
4727 break; 4791 break;
4728 case SCTP_DEFAULT_PRINFO: 4792 case SCTP_DEFAULT_PRINFO:
4729 retval = sctp_setsockopt_defa !! 4793 retval = sctp_setsockopt_default_prinfo(sk, optval, optlen);
4730 break; 4794 break;
4731 case SCTP_RECONFIG_SUPPORTED: 4795 case SCTP_RECONFIG_SUPPORTED:
4732 retval = sctp_setsockopt_reco !! 4796 retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen);
4733 break; 4797 break;
4734 case SCTP_ENABLE_STREAM_RESET: 4798 case SCTP_ENABLE_STREAM_RESET:
4735 retval = sctp_setsockopt_enab !! 4799 retval = sctp_setsockopt_enable_strreset(sk, optval, optlen);
4736 break; 4800 break;
4737 case SCTP_RESET_STREAMS: 4801 case SCTP_RESET_STREAMS:
4738 retval = sctp_setsockopt_rese !! 4802 retval = sctp_setsockopt_reset_streams(sk, optval, optlen);
4739 break; 4803 break;
4740 case SCTP_RESET_ASSOC: 4804 case SCTP_RESET_ASSOC:
4741 retval = sctp_setsockopt_rese !! 4805 retval = sctp_setsockopt_reset_assoc(sk, optval, optlen);
4742 break; 4806 break;
4743 case SCTP_ADD_STREAMS: 4807 case SCTP_ADD_STREAMS:
4744 retval = sctp_setsockopt_add_ !! 4808 retval = sctp_setsockopt_add_streams(sk, optval, optlen);
4745 break; 4809 break;
4746 case SCTP_STREAM_SCHEDULER: 4810 case SCTP_STREAM_SCHEDULER:
4747 retval = sctp_setsockopt_sche !! 4811 retval = sctp_setsockopt_scheduler(sk, optval, optlen);
4748 break; 4812 break;
4749 case SCTP_STREAM_SCHEDULER_VALUE: 4813 case SCTP_STREAM_SCHEDULER_VALUE:
4750 retval = sctp_setsockopt_sche !! 4814 retval = sctp_setsockopt_scheduler_value(sk, optval, optlen);
4751 break; 4815 break;
4752 case SCTP_INTERLEAVING_SUPPORTED: 4816 case SCTP_INTERLEAVING_SUPPORTED:
4753 retval = sctp_setsockopt_inte !! 4817 retval = sctp_setsockopt_interleaving_supported(sk, optval,
4754 4818 optlen);
4755 break; 4819 break;
4756 case SCTP_REUSE_PORT: 4820 case SCTP_REUSE_PORT:
4757 retval = sctp_setsockopt_reus !! 4821 retval = sctp_setsockopt_reuse_port(sk, optval, optlen);
4758 break; 4822 break;
4759 case SCTP_EVENT: 4823 case SCTP_EVENT:
4760 retval = sctp_setsockopt_even !! 4824 retval = sctp_setsockopt_event(sk, optval, optlen);
4761 break; 4825 break;
4762 case SCTP_ASCONF_SUPPORTED: 4826 case SCTP_ASCONF_SUPPORTED:
4763 retval = sctp_setsockopt_asco !! 4827 retval = sctp_setsockopt_asconf_supported(sk, optval, optlen);
4764 break; 4828 break;
4765 case SCTP_AUTH_SUPPORTED: 4829 case SCTP_AUTH_SUPPORTED:
4766 retval = sctp_setsockopt_auth !! 4830 retval = sctp_setsockopt_auth_supported(sk, optval, optlen);
4767 break; 4831 break;
4768 case SCTP_ECN_SUPPORTED: 4832 case SCTP_ECN_SUPPORTED:
4769 retval = sctp_setsockopt_ecn_ !! 4833 retval = sctp_setsockopt_ecn_supported(sk, optval, optlen);
4770 break; <<
4771 case SCTP_EXPOSE_POTENTIALLY_FAILED_S <<
4772 retval = sctp_setsockopt_pf_e <<
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; 4834 break;
4780 default: 4835 default:
4781 retval = -ENOPROTOOPT; 4836 retval = -ENOPROTOOPT;
4782 break; 4837 break;
4783 } 4838 }
4784 4839
4785 release_sock(sk); 4840 release_sock(sk);
4786 kfree(kopt); !! 4841
>> 4842 out_nounlock:
4787 return retval; 4843 return retval;
4788 } 4844 }
4789 4845
4790 /* API 3.1.6 connect() - UDP Style Syntax 4846 /* API 3.1.6 connect() - UDP Style Syntax
4791 * 4847 *
4792 * An application may use the connect() call 4848 * An application may use the connect() call in the UDP model to initiate an
4793 * association without sending data. 4849 * association without sending data.
4794 * 4850 *
4795 * The syntax is: 4851 * The syntax is:
4796 * 4852 *
4797 * ret = connect(int sd, const struct sockadd 4853 * ret = connect(int sd, const struct sockaddr *nam, socklen_t len);
4798 * 4854 *
4799 * sd: the socket descriptor to have a new as 4855 * sd: the socket descriptor to have a new association added to.
4800 * 4856 *
4801 * nam: the address structure (either struct 4857 * nam: the address structure (either struct sockaddr_in or struct
4802 * sockaddr_in6 defined in RFC2553 [7]). 4858 * sockaddr_in6 defined in RFC2553 [7]).
4803 * 4859 *
4804 * len: the size of the address. 4860 * len: the size of the address.
4805 */ 4861 */
4806 static int sctp_connect(struct sock *sk, stru 4862 static int sctp_connect(struct sock *sk, struct sockaddr *addr,
4807 int addr_len, int fla 4863 int addr_len, int flags)
4808 { 4864 {
4809 struct sctp_af *af; 4865 struct sctp_af *af;
4810 int err = -EINVAL; 4866 int err = -EINVAL;
4811 4867
4812 lock_sock(sk); 4868 lock_sock(sk);
4813 pr_debug("%s: sk:%p, sockaddr:%p, add 4869 pr_debug("%s: sk:%p, sockaddr:%p, addr_len:%d\n", __func__, sk,
4814 addr, addr_len); 4870 addr, addr_len);
4815 4871
4816 /* Validate addr_len before calling c 4872 /* Validate addr_len before calling common connect/connectx routine. */
4817 af = sctp_get_af_specific(addr->sa_fa 4873 af = sctp_get_af_specific(addr->sa_family);
4818 if (af && addr_len >= af->sockaddr_le 4874 if (af && addr_len >= af->sockaddr_len)
4819 err = __sctp_connect(sk, addr 4875 err = __sctp_connect(sk, addr, af->sockaddr_len, flags, NULL);
4820 4876
4821 release_sock(sk); 4877 release_sock(sk);
4822 return err; 4878 return err;
4823 } 4879 }
4824 4880
4825 int sctp_inet_connect(struct socket *sock, st 4881 int sctp_inet_connect(struct socket *sock, struct sockaddr *uaddr,
4826 int addr_len, int flags 4882 int addr_len, int flags)
4827 { 4883 {
4828 if (addr_len < sizeof(uaddr->sa_famil 4884 if (addr_len < sizeof(uaddr->sa_family))
4829 return -EINVAL; 4885 return -EINVAL;
4830 4886
4831 if (uaddr->sa_family == AF_UNSPEC) 4887 if (uaddr->sa_family == AF_UNSPEC)
4832 return -EOPNOTSUPP; 4888 return -EOPNOTSUPP;
4833 4889
4834 return sctp_connect(sock->sk, uaddr, 4890 return sctp_connect(sock->sk, uaddr, addr_len, flags);
4835 } 4891 }
4836 4892
4837 /* Only called when shutdown a listening SCTP !! 4893 /* FIXME: Write comments. */
4838 static int sctp_disconnect(struct sock *sk, i 4894 static int sctp_disconnect(struct sock *sk, int flags)
4839 { 4895 {
4840 if (!sctp_style(sk, TCP)) !! 4896 return -EOPNOTSUPP; /* STUB */
4841 return -EOPNOTSUPP; <<
4842 <<
4843 sk->sk_shutdown |= RCV_SHUTDOWN; <<
4844 return 0; <<
4845 } 4897 }
4846 4898
4847 /* 4.1.4 accept() - TCP Style Syntax 4899 /* 4.1.4 accept() - TCP Style Syntax
4848 * 4900 *
4849 * Applications use accept() call to remove a 4901 * Applications use accept() call to remove an established SCTP
4850 * association from the accept queue of the e 4902 * association from the accept queue of the endpoint. A new socket
4851 * descriptor will be returned from accept() 4903 * descriptor will be returned from accept() to represent the newly
4852 * formed association. 4904 * formed association.
4853 */ 4905 */
4854 static struct sock *sctp_accept(struct sock * !! 4906 static struct sock *sctp_accept(struct sock *sk, int flags, int *err, bool kern)
4855 { 4907 {
4856 struct sctp_sock *sp; 4908 struct sctp_sock *sp;
4857 struct sctp_endpoint *ep; 4909 struct sctp_endpoint *ep;
4858 struct sock *newsk = NULL; 4910 struct sock *newsk = NULL;
4859 struct sctp_association *asoc; 4911 struct sctp_association *asoc;
4860 long timeo; 4912 long timeo;
4861 int error = 0; 4913 int error = 0;
4862 4914
4863 lock_sock(sk); 4915 lock_sock(sk);
4864 4916
4865 sp = sctp_sk(sk); 4917 sp = sctp_sk(sk);
4866 ep = sp->ep; 4918 ep = sp->ep;
4867 4919
4868 if (!sctp_style(sk, TCP)) { 4920 if (!sctp_style(sk, TCP)) {
4869 error = -EOPNOTSUPP; 4921 error = -EOPNOTSUPP;
4870 goto out; 4922 goto out;
4871 } 4923 }
4872 4924
4873 if (!sctp_sstate(sk, LISTENING) || !! 4925 if (!sctp_sstate(sk, LISTENING)) {
4874 (sk->sk_shutdown & RCV_SHUTDOWN)) <<
4875 error = -EINVAL; 4926 error = -EINVAL;
4876 goto out; 4927 goto out;
4877 } 4928 }
4878 4929
4879 timeo = sock_rcvtimeo(sk, arg->flags !! 4930 timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
4880 4931
4881 error = sctp_wait_for_accept(sk, time 4932 error = sctp_wait_for_accept(sk, timeo);
4882 if (error) 4933 if (error)
4883 goto out; 4934 goto out;
4884 4935
4885 /* We treat the list of associations 4936 /* We treat the list of associations on the endpoint as the accept
4886 * queue and pick the first associati 4937 * queue and pick the first association on the list.
4887 */ 4938 */
4888 asoc = list_entry(ep->asocs.next, str 4939 asoc = list_entry(ep->asocs.next, struct sctp_association, asocs);
4889 4940
4890 newsk = sp->pf->create_accept_sk(sk, !! 4941 newsk = sp->pf->create_accept_sk(sk, asoc, kern);
4891 if (!newsk) { 4942 if (!newsk) {
4892 error = -ENOMEM; 4943 error = -ENOMEM;
4893 goto out; 4944 goto out;
4894 } 4945 }
4895 4946
4896 /* Populate the fields of the newsk f 4947 /* Populate the fields of the newsk from the oldsk and migrate the
4897 * asoc to the newsk. 4948 * asoc to the newsk.
4898 */ 4949 */
4899 error = sctp_sock_migrate(sk, newsk, 4950 error = sctp_sock_migrate(sk, newsk, asoc, SCTP_SOCKET_TCP);
4900 if (error) { 4951 if (error) {
4901 sk_common_release(newsk); 4952 sk_common_release(newsk);
4902 newsk = NULL; 4953 newsk = NULL;
4903 } 4954 }
4904 4955
4905 out: 4956 out:
4906 release_sock(sk); 4957 release_sock(sk);
4907 arg->err = error; !! 4958 *err = error;
4908 return newsk; 4959 return newsk;
4909 } 4960 }
4910 4961
4911 /* The SCTP ioctl handler. */ 4962 /* The SCTP ioctl handler. */
4912 static int sctp_ioctl(struct sock *sk, int cm !! 4963 static int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
4913 { 4964 {
4914 int rc = -ENOTCONN; 4965 int rc = -ENOTCONN;
4915 4966
4916 lock_sock(sk); 4967 lock_sock(sk);
4917 4968
4918 /* 4969 /*
4919 * SEQPACKET-style sockets in LISTENI 4970 * SEQPACKET-style sockets in LISTENING state are valid, for
4920 * SCTP, so only discard TCP-style so 4971 * SCTP, so only discard TCP-style sockets in LISTENING state.
4921 */ 4972 */
4922 if (sctp_style(sk, TCP) && sctp_sstat 4973 if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
4923 goto out; 4974 goto out;
4924 4975
4925 switch (cmd) { 4976 switch (cmd) {
4926 case SIOCINQ: { 4977 case SIOCINQ: {
4927 struct sk_buff *skb; 4978 struct sk_buff *skb;
4928 *karg = 0; !! 4979 unsigned int amount = 0;
4929 4980
4930 skb = skb_peek(&sk->sk_receiv 4981 skb = skb_peek(&sk->sk_receive_queue);
4931 if (skb != NULL) { 4982 if (skb != NULL) {
4932 /* 4983 /*
4933 * We will only retur 4984 * We will only return the amount of this packet since
4934 * that is all that w 4985 * that is all that will be read.
4935 */ 4986 */
4936 *karg = skb->len; !! 4987 amount = skb->len;
4937 } 4988 }
4938 rc = 0; !! 4989 rc = put_user(amount, (int __user *)arg);
4939 break; 4990 break;
4940 } 4991 }
4941 default: 4992 default:
4942 rc = -ENOIOCTLCMD; 4993 rc = -ENOIOCTLCMD;
4943 break; 4994 break;
4944 } 4995 }
4945 out: 4996 out:
4946 release_sock(sk); 4997 release_sock(sk);
4947 return rc; 4998 return rc;
4948 } 4999 }
4949 5000
4950 /* This is the function which gets called dur 5001 /* This is the function which gets called during socket creation to
4951 * initialized the SCTP-specific portion of t 5002 * initialized the SCTP-specific portion of the sock.
4952 * The sock structure should already be zero- 5003 * The sock structure should already be zero-filled memory.
4953 */ 5004 */
4954 static int sctp_init_sock(struct sock *sk) 5005 static int sctp_init_sock(struct sock *sk)
4955 { 5006 {
4956 struct net *net = sock_net(sk); 5007 struct net *net = sock_net(sk);
4957 struct sctp_sock *sp; 5008 struct sctp_sock *sp;
4958 5009
4959 pr_debug("%s: sk:%p\n", __func__, sk) 5010 pr_debug("%s: sk:%p\n", __func__, sk);
4960 5011
4961 sp = sctp_sk(sk); 5012 sp = sctp_sk(sk);
4962 5013
4963 /* Initialize the SCTP per socket are 5014 /* Initialize the SCTP per socket area. */
4964 switch (sk->sk_type) { 5015 switch (sk->sk_type) {
4965 case SOCK_SEQPACKET: 5016 case SOCK_SEQPACKET:
4966 sp->type = SCTP_SOCKET_UDP; 5017 sp->type = SCTP_SOCKET_UDP;
4967 break; 5018 break;
4968 case SOCK_STREAM: 5019 case SOCK_STREAM:
4969 sp->type = SCTP_SOCKET_TCP; 5020 sp->type = SCTP_SOCKET_TCP;
4970 break; 5021 break;
4971 default: 5022 default:
4972 return -ESOCKTNOSUPPORT; 5023 return -ESOCKTNOSUPPORT;
4973 } 5024 }
4974 5025
4975 sk->sk_gso_type = SKB_GSO_SCTP; 5026 sk->sk_gso_type = SKB_GSO_SCTP;
4976 5027
4977 /* Initialize default send parameters 5028 /* Initialize default send parameters. These parameters can be
4978 * modified with the SCTP_DEFAULT_SEN 5029 * modified with the SCTP_DEFAULT_SEND_PARAM socket option.
4979 */ 5030 */
4980 sp->default_stream = 0; 5031 sp->default_stream = 0;
4981 sp->default_ppid = 0; 5032 sp->default_ppid = 0;
4982 sp->default_flags = 0; 5033 sp->default_flags = 0;
4983 sp->default_context = 0; 5034 sp->default_context = 0;
4984 sp->default_timetolive = 0; 5035 sp->default_timetolive = 0;
4985 5036
4986 sp->default_rcv_context = 0; 5037 sp->default_rcv_context = 0;
4987 sp->max_burst = net->sctp.max_burst; 5038 sp->max_burst = net->sctp.max_burst;
4988 5039
4989 sp->sctp_hmac_alg = net->sctp.sctp_hm 5040 sp->sctp_hmac_alg = net->sctp.sctp_hmac_alg;
4990 5041
4991 /* Initialize default setup parameter 5042 /* Initialize default setup parameters. These parameters
4992 * can be modified with the SCTP_INIT 5043 * can be modified with the SCTP_INITMSG socket option or
4993 * overridden by the SCTP_INIT CMSG. 5044 * overridden by the SCTP_INIT CMSG.
4994 */ 5045 */
4995 sp->initmsg.sinit_num_ostreams = sc 5046 sp->initmsg.sinit_num_ostreams = sctp_max_outstreams;
4996 sp->initmsg.sinit_max_instreams = sc 5047 sp->initmsg.sinit_max_instreams = sctp_max_instreams;
4997 sp->initmsg.sinit_max_attempts = ne 5048 sp->initmsg.sinit_max_attempts = net->sctp.max_retrans_init;
4998 sp->initmsg.sinit_max_init_timeo = ne 5049 sp->initmsg.sinit_max_init_timeo = net->sctp.rto_max;
4999 5050
5000 /* Initialize default RTO related par 5051 /* Initialize default RTO related parameters. These parameters can
5001 * be modified for with the SCTP_RTOI 5052 * be modified for with the SCTP_RTOINFO socket option.
5002 */ 5053 */
5003 sp->rtoinfo.srto_initial = net->sctp. 5054 sp->rtoinfo.srto_initial = net->sctp.rto_initial;
5004 sp->rtoinfo.srto_max = net->sctp. 5055 sp->rtoinfo.srto_max = net->sctp.rto_max;
5005 sp->rtoinfo.srto_min = net->sctp. 5056 sp->rtoinfo.srto_min = net->sctp.rto_min;
5006 5057
5007 /* Initialize default association rel 5058 /* Initialize default association related parameters. These parameters
5008 * can be modified with the SCTP_ASSO 5059 * can be modified with the SCTP_ASSOCINFO socket option.
5009 */ 5060 */
5010 sp->assocparams.sasoc_asocmaxrxt = ne 5061 sp->assocparams.sasoc_asocmaxrxt = net->sctp.max_retrans_association;
5011 sp->assocparams.sasoc_number_peer_des 5062 sp->assocparams.sasoc_number_peer_destinations = 0;
5012 sp->assocparams.sasoc_peer_rwnd = 0; 5063 sp->assocparams.sasoc_peer_rwnd = 0;
5013 sp->assocparams.sasoc_local_rwnd = 0; 5064 sp->assocparams.sasoc_local_rwnd = 0;
5014 sp->assocparams.sasoc_cookie_life = n 5065 sp->assocparams.sasoc_cookie_life = net->sctp.valid_cookie_life;
5015 5066
5016 /* Initialize default event subscript 5067 /* Initialize default event subscriptions. By default, all the
5017 * options are off. 5068 * options are off.
5018 */ 5069 */
5019 sp->subscribe = 0; 5070 sp->subscribe = 0;
5020 5071
5021 /* Default Peer Address Parameters. 5072 /* Default Peer Address Parameters. These defaults can
5022 * be modified via SCTP_PEER_ADDR_PAR 5073 * be modified via SCTP_PEER_ADDR_PARAMS
5023 */ 5074 */
5024 sp->hbinterval = net->sctp.hb_interv 5075 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 5076 sp->pathmaxrxt = net->sctp.max_retrans_path;
5028 sp->pf_retrans = net->sctp.pf_retran 5077 sp->pf_retrans = net->sctp.pf_retrans;
5029 sp->ps_retrans = net->sctp.ps_retran <<
5030 sp->pf_expose = net->sctp.pf_expose <<
5031 sp->pathmtu = 0; /* allow default 5078 sp->pathmtu = 0; /* allow default discovery */
5032 sp->sackdelay = net->sctp.sack_time 5079 sp->sackdelay = net->sctp.sack_timeout;
5033 sp->sackfreq = 2; 5080 sp->sackfreq = 2;
5034 sp->param_flags = SPP_HB_ENABLE | 5081 sp->param_flags = SPP_HB_ENABLE |
5035 SPP_PMTUD_ENABLE | 5082 SPP_PMTUD_ENABLE |
5036 SPP_SACKDELAY_ENABL 5083 SPP_SACKDELAY_ENABLE;
5037 sp->default_ss = SCTP_SS_DEFAULT; 5084 sp->default_ss = SCTP_SS_DEFAULT;
5038 5085
5039 /* If enabled no SCTP message fragmen 5086 /* If enabled no SCTP message fragmentation will be performed.
5040 * Configure through SCTP_DISABLE_FRA 5087 * Configure through SCTP_DISABLE_FRAGMENTS socket option.
5041 */ 5088 */
5042 sp->disable_fragments = 0; 5089 sp->disable_fragments = 0;
5043 5090
5044 /* Enable Nagle algorithm by default. 5091 /* Enable Nagle algorithm by default. */
5045 sp->nodelay = 0; 5092 sp->nodelay = 0;
5046 5093
5047 sp->recvrcvinfo = 0; 5094 sp->recvrcvinfo = 0;
5048 sp->recvnxtinfo = 0; 5095 sp->recvnxtinfo = 0;
5049 5096
5050 /* Enable by default. */ 5097 /* Enable by default. */
5051 sp->v4mapped = 1; 5098 sp->v4mapped = 1;
5052 5099
5053 /* Auto-close idle associations after 5100 /* Auto-close idle associations after the configured
5054 * number of seconds. A value of 0 d 5101 * number of seconds. A value of 0 disables this
5055 * feature. Configure through the SC 5102 * feature. Configure through the SCTP_AUTOCLOSE socket option,
5056 * for UDP-style sockets only. 5103 * for UDP-style sockets only.
5057 */ 5104 */
5058 sp->autoclose = 0; 5105 sp->autoclose = 0;
5059 5106
5060 /* User specified fragmentation limit 5107 /* User specified fragmentation limit. */
5061 sp->user_frag = 0; 5108 sp->user_frag = 0;
5062 5109
5063 sp->adaptation_ind = 0; 5110 sp->adaptation_ind = 0;
5064 5111
5065 sp->pf = sctp_get_pf_specific(sk->sk_ 5112 sp->pf = sctp_get_pf_specific(sk->sk_family);
5066 5113
5067 /* Control variables for partial data 5114 /* Control variables for partial data delivery. */
5068 atomic_set(&sp->pd_mode, 0); 5115 atomic_set(&sp->pd_mode, 0);
5069 skb_queue_head_init(&sp->pd_lobby); 5116 skb_queue_head_init(&sp->pd_lobby);
5070 sp->frag_interleave = 0; 5117 sp->frag_interleave = 0;
5071 sp->probe_interval = net->sctp.probe_ <<
5072 5118
5073 /* Create a per socket endpoint struc 5119 /* Create a per socket endpoint structure. Even if we
5074 * change the data structure relation 5120 * change the data structure relationships, this may still
5075 * be useful for storing pre-connect 5121 * be useful for storing pre-connect address information.
5076 */ 5122 */
5077 sp->ep = sctp_endpoint_new(sk, GFP_KE 5123 sp->ep = sctp_endpoint_new(sk, GFP_KERNEL);
5078 if (!sp->ep) 5124 if (!sp->ep)
5079 return -ENOMEM; 5125 return -ENOMEM;
5080 5126
5081 sp->hmac = NULL; 5127 sp->hmac = NULL;
5082 5128
5083 sk->sk_destruct = sctp_destruct_sock; 5129 sk->sk_destruct = sctp_destruct_sock;
5084 5130
5085 SCTP_DBG_OBJCNT_INC(sock); 5131 SCTP_DBG_OBJCNT_INC(sock);
5086 5132
>> 5133 local_bh_disable();
5087 sk_sockets_allocated_inc(sk); 5134 sk_sockets_allocated_inc(sk);
5088 sock_prot_inuse_add(net, sk->sk_prot, 5135 sock_prot_inuse_add(net, sk->sk_prot, 1);
5089 5136
>> 5137 local_bh_enable();
>> 5138
5090 return 0; 5139 return 0;
5091 } 5140 }
5092 5141
5093 /* Cleanup any SCTP per socket resources. Mus 5142 /* Cleanup any SCTP per socket resources. Must be called with
5094 * sock_net(sk)->sctp.addr_wq_lock held if sp 5143 * sock_net(sk)->sctp.addr_wq_lock held if sp->do_auto_asconf is true
5095 */ 5144 */
5096 static void sctp_destroy_sock(struct sock *sk 5145 static void sctp_destroy_sock(struct sock *sk)
5097 { 5146 {
5098 struct sctp_sock *sp; 5147 struct sctp_sock *sp;
5099 5148
5100 pr_debug("%s: sk:%p\n", __func__, sk) 5149 pr_debug("%s: sk:%p\n", __func__, sk);
5101 5150
5102 /* Release our hold on the endpoint. 5151 /* Release our hold on the endpoint. */
5103 sp = sctp_sk(sk); 5152 sp = sctp_sk(sk);
5104 /* This could happen during socket in 5153 /* This could happen during socket init, thus we bail out
5105 * early, since the rest of the below 5154 * early, since the rest of the below is not setup either.
5106 */ 5155 */
5107 if (sp->ep == NULL) 5156 if (sp->ep == NULL)
5108 return; 5157 return;
5109 5158
5110 if (sp->do_auto_asconf) { 5159 if (sp->do_auto_asconf) {
5111 sp->do_auto_asconf = 0; 5160 sp->do_auto_asconf = 0;
5112 list_del(&sp->auto_asconf_lis 5161 list_del(&sp->auto_asconf_list);
5113 } 5162 }
5114 sctp_endpoint_free(sp->ep); 5163 sctp_endpoint_free(sp->ep);
>> 5164 local_bh_disable();
5115 sk_sockets_allocated_dec(sk); 5165 sk_sockets_allocated_dec(sk);
5116 sock_prot_inuse_add(sock_net(sk), sk- 5166 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
>> 5167 local_bh_enable();
5117 } 5168 }
5118 5169
5119 /* Triggered when there are no references on 5170 /* Triggered when there are no references on the socket anymore */
5120 static void sctp_destruct_common(struct sock 5171 static void sctp_destruct_common(struct sock *sk)
5121 { 5172 {
5122 struct sctp_sock *sp = sctp_sk(sk); 5173 struct sctp_sock *sp = sctp_sk(sk);
5123 5174
5124 /* Free up the HMAC transform. */ 5175 /* Free up the HMAC transform. */
5125 crypto_free_shash(sp->hmac); 5176 crypto_free_shash(sp->hmac);
5126 } 5177 }
5127 5178
5128 static void sctp_destruct_sock(struct sock *s 5179 static void sctp_destruct_sock(struct sock *sk)
5129 { 5180 {
5130 sctp_destruct_common(sk); 5181 sctp_destruct_common(sk);
5131 inet_sock_destruct(sk); 5182 inet_sock_destruct(sk);
5132 } 5183 }
5133 5184
5134 /* API 4.1.7 shutdown() - TCP Style Syntax 5185 /* API 4.1.7 shutdown() - TCP Style Syntax
5135 * int shutdown(int socket, int how); 5186 * int shutdown(int socket, int how);
5136 * 5187 *
5137 * sd - the socket descriptor of the 5188 * sd - the socket descriptor of the association to be closed.
5138 * how - Specifies the type of shutdo 5189 * how - Specifies the type of shutdown. The values are
5139 * as follows: 5190 * as follows:
5140 * SHUT_RD 5191 * SHUT_RD
5141 * Disables further recei 5192 * Disables further receive operations. No SCTP
5142 * protocol action is tak 5193 * protocol action is taken.
5143 * SHUT_WR 5194 * SHUT_WR
5144 * Disables further send 5195 * Disables further send operations, and initiates
5145 * the SCTP shutdown sequ 5196 * the SCTP shutdown sequence.
5146 * SHUT_RDWR 5197 * SHUT_RDWR
5147 * Disables further send 5198 * Disables further send and receive operations
5148 * and initiates the SCTP 5199 * and initiates the SCTP shutdown sequence.
5149 */ 5200 */
5150 static void sctp_shutdown(struct sock *sk, in 5201 static void sctp_shutdown(struct sock *sk, int how)
5151 { 5202 {
5152 struct net *net = sock_net(sk); 5203 struct net *net = sock_net(sk);
5153 struct sctp_endpoint *ep; 5204 struct sctp_endpoint *ep;
5154 5205
5155 if (!sctp_style(sk, TCP)) 5206 if (!sctp_style(sk, TCP))
5156 return; 5207 return;
5157 5208
5158 ep = sctp_sk(sk)->ep; 5209 ep = sctp_sk(sk)->ep;
5159 if (how & SEND_SHUTDOWN && !list_empt 5210 if (how & SEND_SHUTDOWN && !list_empty(&ep->asocs)) {
5160 struct sctp_association *asoc 5211 struct sctp_association *asoc;
5161 5212
5162 inet_sk_set_state(sk, SCTP_SS 5213 inet_sk_set_state(sk, SCTP_SS_CLOSING);
5163 asoc = list_entry(ep->asocs.n 5214 asoc = list_entry(ep->asocs.next,
5164 struct sctp 5215 struct sctp_association, asocs);
5165 sctp_primitive_SHUTDOWN(net, 5216 sctp_primitive_SHUTDOWN(net, asoc, NULL);
5166 } 5217 }
5167 } 5218 }
5168 5219
5169 int sctp_get_sctp_info(struct sock *sk, struc 5220 int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc,
5170 struct sctp_info *info 5221 struct sctp_info *info)
5171 { 5222 {
5172 struct sctp_transport *prim; 5223 struct sctp_transport *prim;
5173 struct list_head *pos; 5224 struct list_head *pos;
5174 int mask; 5225 int mask;
5175 5226
5176 memset(info, 0, sizeof(*info)); 5227 memset(info, 0, sizeof(*info));
5177 if (!asoc) { 5228 if (!asoc) {
5178 struct sctp_sock *sp = sctp_s 5229 struct sctp_sock *sp = sctp_sk(sk);
5179 5230
5180 info->sctpi_s_autoclose = sp- 5231 info->sctpi_s_autoclose = sp->autoclose;
5181 info->sctpi_s_adaptation_ind 5232 info->sctpi_s_adaptation_ind = sp->adaptation_ind;
5182 info->sctpi_s_pd_point = sp-> 5233 info->sctpi_s_pd_point = sp->pd_point;
5183 info->sctpi_s_nodelay = sp->n 5234 info->sctpi_s_nodelay = sp->nodelay;
5184 info->sctpi_s_disable_fragmen 5235 info->sctpi_s_disable_fragments = sp->disable_fragments;
5185 info->sctpi_s_v4mapped = sp-> 5236 info->sctpi_s_v4mapped = sp->v4mapped;
5186 info->sctpi_s_frag_interleave 5237 info->sctpi_s_frag_interleave = sp->frag_interleave;
5187 info->sctpi_s_type = sp->type 5238 info->sctpi_s_type = sp->type;
5188 5239
5189 return 0; 5240 return 0;
5190 } 5241 }
5191 5242
5192 info->sctpi_tag = asoc->c.my_vtag; 5243 info->sctpi_tag = asoc->c.my_vtag;
5193 info->sctpi_state = asoc->state; 5244 info->sctpi_state = asoc->state;
5194 info->sctpi_rwnd = asoc->a_rwnd; 5245 info->sctpi_rwnd = asoc->a_rwnd;
5195 info->sctpi_unackdata = asoc->unack_d 5246 info->sctpi_unackdata = asoc->unack_data;
5196 info->sctpi_penddata = sctp_tsnmap_pe 5247 info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);
5197 info->sctpi_instrms = asoc->stream.in 5248 info->sctpi_instrms = asoc->stream.incnt;
5198 info->sctpi_outstrms = asoc->stream.o 5249 info->sctpi_outstrms = asoc->stream.outcnt;
5199 list_for_each(pos, &asoc->base.inqueu 5250 list_for_each(pos, &asoc->base.inqueue.in_chunk_list)
5200 info->sctpi_inqueue++; 5251 info->sctpi_inqueue++;
5201 list_for_each(pos, &asoc->outqueue.ou 5252 list_for_each(pos, &asoc->outqueue.out_chunk_list)
5202 info->sctpi_outqueue++; 5253 info->sctpi_outqueue++;
5203 info->sctpi_overall_error = asoc->ove 5254 info->sctpi_overall_error = asoc->overall_error_count;
5204 info->sctpi_max_burst = asoc->max_bur 5255 info->sctpi_max_burst = asoc->max_burst;
5205 info->sctpi_maxseg = asoc->frag_point 5256 info->sctpi_maxseg = asoc->frag_point;
5206 info->sctpi_peer_rwnd = asoc->peer.rw 5257 info->sctpi_peer_rwnd = asoc->peer.rwnd;
5207 info->sctpi_peer_tag = asoc->c.peer_v 5258 info->sctpi_peer_tag = asoc->c.peer_vtag;
5208 5259
5209 mask = asoc->peer.intl_capable << 1; !! 5260 mask = asoc->peer.ecn_capable << 1;
5210 mask = (mask | asoc->peer.ecn_capable <<
5211 mask = (mask | asoc->peer.ipv4_addres 5261 mask = (mask | asoc->peer.ipv4_address) << 1;
5212 mask = (mask | asoc->peer.ipv6_addres 5262 mask = (mask | asoc->peer.ipv6_address) << 1;
5213 mask = (mask | asoc->peer.reconf_capa !! 5263 mask = (mask | asoc->peer.hostname_address) << 1;
5214 mask = (mask | asoc->peer.asconf_capa 5264 mask = (mask | asoc->peer.asconf_capable) << 1;
5215 mask = (mask | asoc->peer.prsctp_capa 5265 mask = (mask | asoc->peer.prsctp_capable) << 1;
5216 mask = (mask | asoc->peer.auth_capabl 5266 mask = (mask | asoc->peer.auth_capable);
5217 info->sctpi_peer_capable = mask; 5267 info->sctpi_peer_capable = mask;
5218 mask = asoc->peer.sack_needed << 1; 5268 mask = asoc->peer.sack_needed << 1;
5219 mask = (mask | asoc->peer.sack_genera 5269 mask = (mask | asoc->peer.sack_generation) << 1;
5220 mask = (mask | asoc->peer.zero_window 5270 mask = (mask | asoc->peer.zero_window_announced);
5221 info->sctpi_peer_sack = mask; 5271 info->sctpi_peer_sack = mask;
5222 5272
5223 info->sctpi_isacks = asoc->stats.isac 5273 info->sctpi_isacks = asoc->stats.isacks;
5224 info->sctpi_osacks = asoc->stats.osac 5274 info->sctpi_osacks = asoc->stats.osacks;
5225 info->sctpi_opackets = asoc->stats.op 5275 info->sctpi_opackets = asoc->stats.opackets;
5226 info->sctpi_ipackets = asoc->stats.ip 5276 info->sctpi_ipackets = asoc->stats.ipackets;
5227 info->sctpi_rtxchunks = asoc->stats.r 5277 info->sctpi_rtxchunks = asoc->stats.rtxchunks;
5228 info->sctpi_outofseqtsns = asoc->stat 5278 info->sctpi_outofseqtsns = asoc->stats.outofseqtsns;
5229 info->sctpi_idupchunks = asoc->stats. 5279 info->sctpi_idupchunks = asoc->stats.idupchunks;
5230 info->sctpi_gapcnt = asoc->stats.gapc 5280 info->sctpi_gapcnt = asoc->stats.gapcnt;
5231 info->sctpi_ouodchunks = asoc->stats. 5281 info->sctpi_ouodchunks = asoc->stats.ouodchunks;
5232 info->sctpi_iuodchunks = asoc->stats. 5282 info->sctpi_iuodchunks = asoc->stats.iuodchunks;
5233 info->sctpi_oodchunks = asoc->stats.o 5283 info->sctpi_oodchunks = asoc->stats.oodchunks;
5234 info->sctpi_iodchunks = asoc->stats.i 5284 info->sctpi_iodchunks = asoc->stats.iodchunks;
5235 info->sctpi_octrlchunks = asoc->stats 5285 info->sctpi_octrlchunks = asoc->stats.octrlchunks;
5236 info->sctpi_ictrlchunks = asoc->stats 5286 info->sctpi_ictrlchunks = asoc->stats.ictrlchunks;
5237 5287
5238 prim = asoc->peer.primary_path; 5288 prim = asoc->peer.primary_path;
5239 memcpy(&info->sctpi_p_address, &prim- 5289 memcpy(&info->sctpi_p_address, &prim->ipaddr, sizeof(prim->ipaddr));
5240 info->sctpi_p_state = prim->state; 5290 info->sctpi_p_state = prim->state;
5241 info->sctpi_p_cwnd = prim->cwnd; 5291 info->sctpi_p_cwnd = prim->cwnd;
5242 info->sctpi_p_srtt = prim->srtt; 5292 info->sctpi_p_srtt = prim->srtt;
5243 info->sctpi_p_rto = jiffies_to_msecs( 5293 info->sctpi_p_rto = jiffies_to_msecs(prim->rto);
5244 info->sctpi_p_hbinterval = prim->hbin 5294 info->sctpi_p_hbinterval = prim->hbinterval;
5245 info->sctpi_p_pathmaxrxt = prim->path 5295 info->sctpi_p_pathmaxrxt = prim->pathmaxrxt;
5246 info->sctpi_p_sackdelay = jiffies_to_ 5296 info->sctpi_p_sackdelay = jiffies_to_msecs(prim->sackdelay);
5247 info->sctpi_p_ssthresh = prim->ssthre 5297 info->sctpi_p_ssthresh = prim->ssthresh;
5248 info->sctpi_p_partial_bytes_acked = p 5298 info->sctpi_p_partial_bytes_acked = prim->partial_bytes_acked;
5249 info->sctpi_p_flight_size = prim->fli 5299 info->sctpi_p_flight_size = prim->flight_size;
5250 info->sctpi_p_error = prim->error_cou 5300 info->sctpi_p_error = prim->error_count;
5251 5301
5252 return 0; 5302 return 0;
5253 } 5303 }
5254 EXPORT_SYMBOL_GPL(sctp_get_sctp_info); 5304 EXPORT_SYMBOL_GPL(sctp_get_sctp_info);
5255 5305
5256 /* use callback to avoid exporting the core s 5306 /* use callback to avoid exporting the core structure */
5257 void sctp_transport_walk_start(struct rhashta !! 5307 void sctp_transport_walk_start(struct rhashtable_iter *iter)
5258 { 5308 {
5259 rhltable_walk_enter(&sctp_transport_h 5309 rhltable_walk_enter(&sctp_transport_hashtable, iter);
5260 5310
5261 rhashtable_walk_start(iter); 5311 rhashtable_walk_start(iter);
5262 } 5312 }
5263 5313
5264 void sctp_transport_walk_stop(struct rhashtab !! 5314 void sctp_transport_walk_stop(struct rhashtable_iter *iter)
5265 { 5315 {
5266 rhashtable_walk_stop(iter); 5316 rhashtable_walk_stop(iter);
5267 rhashtable_walk_exit(iter); 5317 rhashtable_walk_exit(iter);
5268 } 5318 }
5269 5319
5270 struct sctp_transport *sctp_transport_get_nex 5320 struct sctp_transport *sctp_transport_get_next(struct net *net,
5271 5321 struct rhashtable_iter *iter)
5272 { 5322 {
5273 struct sctp_transport *t; 5323 struct sctp_transport *t;
5274 5324
5275 t = rhashtable_walk_next(iter); 5325 t = rhashtable_walk_next(iter);
5276 for (; t; t = rhashtable_walk_next(it 5326 for (; t; t = rhashtable_walk_next(iter)) {
5277 if (IS_ERR(t)) { 5327 if (IS_ERR(t)) {
5278 if (PTR_ERR(t) == -EA 5328 if (PTR_ERR(t) == -EAGAIN)
5279 continue; 5329 continue;
5280 break; 5330 break;
5281 } 5331 }
5282 5332
5283 if (!sctp_transport_hold(t)) 5333 if (!sctp_transport_hold(t))
5284 continue; 5334 continue;
5285 5335
5286 if (net_eq(t->asoc->base.net, !! 5336 if (net_eq(sock_net(t->asoc->base.sk), net) &&
5287 t->asoc->peer.primary_pat 5337 t->asoc->peer.primary_path == t)
5288 break; 5338 break;
5289 5339
5290 sctp_transport_put(t); 5340 sctp_transport_put(t);
5291 } 5341 }
5292 5342
5293 return t; 5343 return t;
5294 } 5344 }
5295 5345
5296 struct sctp_transport *sctp_transport_get_idx 5346 struct sctp_transport *sctp_transport_get_idx(struct net *net,
5297 5347 struct rhashtable_iter *iter,
5298 5348 int pos)
5299 { 5349 {
5300 struct sctp_transport *t; 5350 struct sctp_transport *t;
5301 5351
5302 if (!pos) 5352 if (!pos)
5303 return SEQ_START_TOKEN; 5353 return SEQ_START_TOKEN;
5304 5354
5305 while ((t = sctp_transport_get_next(n 5355 while ((t = sctp_transport_get_next(net, iter)) && !IS_ERR(t)) {
5306 if (!--pos) 5356 if (!--pos)
5307 break; 5357 break;
5308 sctp_transport_put(t); 5358 sctp_transport_put(t);
5309 } 5359 }
5310 5360
5311 return t; 5361 return t;
5312 } 5362 }
5313 5363
5314 int sctp_for_each_endpoint(int (*cb)(struct s 5364 int sctp_for_each_endpoint(int (*cb)(struct sctp_endpoint *, void *),
5315 void *p) { 5365 void *p) {
5316 int err = 0; 5366 int err = 0;
5317 int hash = 0; 5367 int hash = 0;
5318 struct sctp_endpoint *ep; 5368 struct sctp_endpoint *ep;
5319 struct sctp_hashbucket *head; 5369 struct sctp_hashbucket *head;
5320 5370
5321 for (head = sctp_ep_hashtable; hash < 5371 for (head = sctp_ep_hashtable; hash < sctp_ep_hashsize;
5322 hash++, head++) { 5372 hash++, head++) {
5323 read_lock_bh(&head->lock); 5373 read_lock_bh(&head->lock);
5324 sctp_for_each_hentry(ep, &hea 5374 sctp_for_each_hentry(ep, &head->chain) {
5325 err = cb(ep, p); 5375 err = cb(ep, p);
5326 if (err) 5376 if (err)
5327 break; 5377 break;
5328 } 5378 }
5329 read_unlock_bh(&head->lock); 5379 read_unlock_bh(&head->lock);
5330 } 5380 }
5331 5381
5332 return err; 5382 return err;
5333 } 5383 }
5334 EXPORT_SYMBOL_GPL(sctp_for_each_endpoint); 5384 EXPORT_SYMBOL_GPL(sctp_for_each_endpoint);
5335 5385
5336 int sctp_transport_lookup_process(sctp_callba !! 5386 int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *),
>> 5387 struct net *net,
5337 const union 5388 const union sctp_addr *laddr,
5338 const union !! 5389 const union sctp_addr *paddr, void *p)
5339 { 5390 {
5340 struct sctp_transport *transport; 5391 struct sctp_transport *transport;
5341 struct sctp_endpoint *ep; !! 5392 int err;
5342 int err = -ENOENT; <<
5343 5393
5344 rcu_read_lock(); 5394 rcu_read_lock();
5345 transport = sctp_addrs_lookup_transpo !! 5395 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(); 5396 rcu_read_unlock();
>> 5397 if (!transport)
>> 5398 return -ENOENT;
5357 5399
5358 err = cb(ep, transport, p); !! 5400 err = cb(transport, p);
5359 sctp_endpoint_put(ep); <<
5360 sctp_transport_put(transport); 5401 sctp_transport_put(transport);
>> 5402
5361 return err; 5403 return err;
5362 } 5404 }
5363 EXPORT_SYMBOL_GPL(sctp_transport_lookup_proce 5405 EXPORT_SYMBOL_GPL(sctp_transport_lookup_process);
5364 5406
5365 int sctp_transport_traverse_process(sctp_call 5407 int sctp_transport_traverse_process(sctp_callback_t cb, sctp_callback_t cb_done,
5366 struct ne 5408 struct net *net, int *pos, void *p)
5367 { 5409 {
5368 struct rhashtable_iter hti; 5410 struct rhashtable_iter hti;
5369 struct sctp_transport *tsp; 5411 struct sctp_transport *tsp;
5370 struct sctp_endpoint *ep; 5412 struct sctp_endpoint *ep;
5371 int ret; 5413 int ret;
5372 5414
5373 again: 5415 again:
5374 ret = 0; 5416 ret = 0;
5375 sctp_transport_walk_start(&hti); 5417 sctp_transport_walk_start(&hti);
5376 5418
5377 tsp = sctp_transport_get_idx(net, &ht 5419 tsp = sctp_transport_get_idx(net, &hti, *pos + 1);
5378 for (; !IS_ERR_OR_NULL(tsp); tsp = sc 5420 for (; !IS_ERR_OR_NULL(tsp); tsp = sctp_transport_get_next(net, &hti)) {
5379 ep = tsp->asoc->ep; 5421 ep = tsp->asoc->ep;
5380 if (sctp_endpoint_hold(ep)) { 5422 if (sctp_endpoint_hold(ep)) { /* asoc can be peeled off */
5381 ret = cb(ep, tsp, p); 5423 ret = cb(ep, tsp, p);
5382 if (ret) 5424 if (ret)
5383 break; 5425 break;
5384 sctp_endpoint_put(ep) 5426 sctp_endpoint_put(ep);
5385 } 5427 }
5386 (*pos)++; 5428 (*pos)++;
5387 sctp_transport_put(tsp); 5429 sctp_transport_put(tsp);
5388 } 5430 }
5389 sctp_transport_walk_stop(&hti); 5431 sctp_transport_walk_stop(&hti);
5390 5432
5391 if (ret) { 5433 if (ret) {
5392 if (cb_done && !cb_done(ep, t 5434 if (cb_done && !cb_done(ep, tsp, p)) {
5393 (*pos)++; 5435 (*pos)++;
5394 sctp_endpoint_put(ep) 5436 sctp_endpoint_put(ep);
5395 sctp_transport_put(ts 5437 sctp_transport_put(tsp);
5396 goto again; 5438 goto again;
5397 } 5439 }
5398 sctp_endpoint_put(ep); 5440 sctp_endpoint_put(ep);
5399 sctp_transport_put(tsp); 5441 sctp_transport_put(tsp);
5400 } 5442 }
5401 5443
5402 return ret; 5444 return ret;
5403 } 5445 }
5404 EXPORT_SYMBOL_GPL(sctp_transport_traverse_pro 5446 EXPORT_SYMBOL_GPL(sctp_transport_traverse_process);
5405 5447
5406 /* 7.2.1 Association Status (SCTP_STATUS) 5448 /* 7.2.1 Association Status (SCTP_STATUS)
5407 5449
5408 * Applications can retrieve current status i 5450 * Applications can retrieve current status information about an
5409 * association, including association state, 5451 * association, including association state, peer receiver window size,
5410 * number of unacked data chunks, and number 5452 * number of unacked data chunks, and number of data chunks pending
5411 * receipt. This information is read-only. 5453 * receipt. This information is read-only.
5412 */ 5454 */
5413 static int sctp_getsockopt_sctp_status(struct 5455 static int sctp_getsockopt_sctp_status(struct sock *sk, int len,
5414 char _ 5456 char __user *optval,
5415 int __ 5457 int __user *optlen)
5416 { 5458 {
5417 struct sctp_status status; 5459 struct sctp_status status;
5418 struct sctp_association *asoc = NULL; 5460 struct sctp_association *asoc = NULL;
5419 struct sctp_transport *transport; 5461 struct sctp_transport *transport;
5420 sctp_assoc_t associd; 5462 sctp_assoc_t associd;
5421 int retval = 0; 5463 int retval = 0;
5422 5464
5423 if (len < sizeof(status)) { 5465 if (len < sizeof(status)) {
5424 retval = -EINVAL; 5466 retval = -EINVAL;
5425 goto out; 5467 goto out;
5426 } 5468 }
5427 5469
5428 len = sizeof(status); 5470 len = sizeof(status);
5429 if (copy_from_user(&status, optval, l 5471 if (copy_from_user(&status, optval, len)) {
5430 retval = -EFAULT; 5472 retval = -EFAULT;
5431 goto out; 5473 goto out;
5432 } 5474 }
5433 5475
5434 associd = status.sstat_assoc_id; 5476 associd = status.sstat_assoc_id;
5435 asoc = sctp_id2assoc(sk, associd); 5477 asoc = sctp_id2assoc(sk, associd);
5436 if (!asoc) { 5478 if (!asoc) {
5437 retval = -EINVAL; 5479 retval = -EINVAL;
5438 goto out; 5480 goto out;
5439 } 5481 }
5440 5482
5441 transport = asoc->peer.primary_path; 5483 transport = asoc->peer.primary_path;
5442 5484
5443 status.sstat_assoc_id = sctp_assoc2id 5485 status.sstat_assoc_id = sctp_assoc2id(asoc);
5444 status.sstat_state = sctp_assoc_to_st 5486 status.sstat_state = sctp_assoc_to_state(asoc);
5445 status.sstat_rwnd = asoc->peer.rwnd; 5487 status.sstat_rwnd = asoc->peer.rwnd;
5446 status.sstat_unackdata = asoc->unack_ 5488 status.sstat_unackdata = asoc->unack_data;
5447 5489
5448 status.sstat_penddata = sctp_tsnmap_p 5490 status.sstat_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);
5449 status.sstat_instrms = asoc->stream.i 5491 status.sstat_instrms = asoc->stream.incnt;
5450 status.sstat_outstrms = asoc->stream. 5492 status.sstat_outstrms = asoc->stream.outcnt;
5451 status.sstat_fragmentation_point = as 5493 status.sstat_fragmentation_point = asoc->frag_point;
5452 status.sstat_primary.spinfo_assoc_id 5494 status.sstat_primary.spinfo_assoc_id = sctp_assoc2id(transport->asoc);
5453 memcpy(&status.sstat_primary.spinfo_a 5495 memcpy(&status.sstat_primary.spinfo_address, &transport->ipaddr,
5454 transport->af_specifi 5496 transport->af_specific->sockaddr_len);
5455 /* Map ipv4 address into v4-mapped-on 5497 /* Map ipv4 address into v4-mapped-on-v6 address. */
5456 sctp_get_pf_specific(sk->sk_family)-> 5498 sctp_get_pf_specific(sk->sk_family)->addr_to_user(sctp_sk(sk),
5457 (union sctp_addr *)&status.ss 5499 (union sctp_addr *)&status.sstat_primary.spinfo_address);
5458 status.sstat_primary.spinfo_state = t 5500 status.sstat_primary.spinfo_state = transport->state;
5459 status.sstat_primary.spinfo_cwnd = tr 5501 status.sstat_primary.spinfo_cwnd = transport->cwnd;
5460 status.sstat_primary.spinfo_srtt = tr 5502 status.sstat_primary.spinfo_srtt = transport->srtt;
5461 status.sstat_primary.spinfo_rto = jif 5503 status.sstat_primary.spinfo_rto = jiffies_to_msecs(transport->rto);
5462 status.sstat_primary.spinfo_mtu = tra 5504 status.sstat_primary.spinfo_mtu = transport->pathmtu;
5463 5505
5464 if (status.sstat_primary.spinfo_state 5506 if (status.sstat_primary.spinfo_state == SCTP_UNKNOWN)
5465 status.sstat_primary.spinfo_s 5507 status.sstat_primary.spinfo_state = SCTP_ACTIVE;
5466 5508
5467 if (put_user(len, optlen)) { 5509 if (put_user(len, optlen)) {
5468 retval = -EFAULT; 5510 retval = -EFAULT;
5469 goto out; 5511 goto out;
5470 } 5512 }
5471 5513
5472 pr_debug("%s: len:%d, state:%d, rwnd: 5514 pr_debug("%s: len:%d, state:%d, rwnd:%d, assoc_id:%d\n",
5473 __func__, len, status.sstat_ 5515 __func__, len, status.sstat_state, status.sstat_rwnd,
5474 status.sstat_assoc_id); 5516 status.sstat_assoc_id);
5475 5517
5476 if (copy_to_user(optval, &status, len 5518 if (copy_to_user(optval, &status, len)) {
5477 retval = -EFAULT; 5519 retval = -EFAULT;
5478 goto out; 5520 goto out;
5479 } 5521 }
5480 5522
5481 out: 5523 out:
5482 return retval; 5524 return retval;
5483 } 5525 }
5484 5526
5485 5527
5486 /* 7.2.2 Peer Address Information (SCTP_GET_P 5528 /* 7.2.2 Peer Address Information (SCTP_GET_PEER_ADDR_INFO)
5487 * 5529 *
5488 * Applications can retrieve information abou 5530 * Applications can retrieve information about a specific peer address
5489 * of an association, including its reachabil 5531 * of an association, including its reachability state, congestion
5490 * window, and retransmission timer values. 5532 * window, and retransmission timer values. This information is
5491 * read-only. 5533 * read-only.
5492 */ 5534 */
5493 static int sctp_getsockopt_peer_addr_info(str 5535 static int sctp_getsockopt_peer_addr_info(struct sock *sk, int len,
5494 cha 5536 char __user *optval,
5495 int 5537 int __user *optlen)
5496 { 5538 {
5497 struct sctp_paddrinfo pinfo; 5539 struct sctp_paddrinfo pinfo;
5498 struct sctp_transport *transport; 5540 struct sctp_transport *transport;
5499 int retval = 0; 5541 int retval = 0;
5500 5542
5501 if (len < sizeof(pinfo)) { 5543 if (len < sizeof(pinfo)) {
5502 retval = -EINVAL; 5544 retval = -EINVAL;
5503 goto out; 5545 goto out;
5504 } 5546 }
5505 5547
5506 len = sizeof(pinfo); 5548 len = sizeof(pinfo);
5507 if (copy_from_user(&pinfo, optval, le 5549 if (copy_from_user(&pinfo, optval, len)) {
5508 retval = -EFAULT; 5550 retval = -EFAULT;
5509 goto out; 5551 goto out;
5510 } 5552 }
5511 5553
5512 transport = sctp_addr_id2transport(sk 5554 transport = sctp_addr_id2transport(sk, &pinfo.spinfo_address,
5513 pi 5555 pinfo.spinfo_assoc_id);
5514 if (!transport) { !! 5556 if (!transport)
5515 retval = -EINVAL; !! 5557 return -EINVAL;
5516 goto out; <<
5517 } <<
5518 <<
5519 if (transport->state == SCTP_PF && <<
5520 transport->asoc->pf_expose == SCT <<
5521 retval = -EACCES; <<
5522 goto out; <<
5523 } <<
5524 5558
5525 pinfo.spinfo_assoc_id = sctp_assoc2id 5559 pinfo.spinfo_assoc_id = sctp_assoc2id(transport->asoc);
5526 pinfo.spinfo_state = transport->state 5560 pinfo.spinfo_state = transport->state;
5527 pinfo.spinfo_cwnd = transport->cwnd; 5561 pinfo.spinfo_cwnd = transport->cwnd;
5528 pinfo.spinfo_srtt = transport->srtt; 5562 pinfo.spinfo_srtt = transport->srtt;
5529 pinfo.spinfo_rto = jiffies_to_msecs(t 5563 pinfo.spinfo_rto = jiffies_to_msecs(transport->rto);
5530 pinfo.spinfo_mtu = transport->pathmtu 5564 pinfo.spinfo_mtu = transport->pathmtu;
5531 5565
5532 if (pinfo.spinfo_state == SCTP_UNKNOW 5566 if (pinfo.spinfo_state == SCTP_UNKNOWN)
5533 pinfo.spinfo_state = SCTP_ACT 5567 pinfo.spinfo_state = SCTP_ACTIVE;
5534 5568
5535 if (put_user(len, optlen)) { 5569 if (put_user(len, optlen)) {
5536 retval = -EFAULT; 5570 retval = -EFAULT;
5537 goto out; 5571 goto out;
5538 } 5572 }
5539 5573
5540 if (copy_to_user(optval, &pinfo, len) 5574 if (copy_to_user(optval, &pinfo, len)) {
5541 retval = -EFAULT; 5575 retval = -EFAULT;
5542 goto out; 5576 goto out;
5543 } 5577 }
5544 5578
5545 out: 5579 out:
5546 return retval; 5580 return retval;
5547 } 5581 }
5548 5582
5549 /* 7.1.12 Enable/Disable message fragmentatio 5583 /* 7.1.12 Enable/Disable message fragmentation (SCTP_DISABLE_FRAGMENTS)
5550 * 5584 *
5551 * This option is a on/off flag. If enabled 5585 * This option is a on/off flag. If enabled no SCTP message
5552 * fragmentation will be performed. Instead 5586 * fragmentation will be performed. Instead if a message being sent
5553 * exceeds the current PMTU size, the message 5587 * exceeds the current PMTU size, the message will NOT be sent and
5554 * instead a error will be indicated to the u 5588 * instead a error will be indicated to the user.
5555 */ 5589 */
5556 static int sctp_getsockopt_disable_fragments( 5590 static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
5557 char 5591 char __user *optval, int __user *optlen)
5558 { 5592 {
5559 int val; 5593 int val;
5560 5594
5561 if (len < sizeof(int)) 5595 if (len < sizeof(int))
5562 return -EINVAL; 5596 return -EINVAL;
5563 5597
5564 len = sizeof(int); 5598 len = sizeof(int);
5565 val = (sctp_sk(sk)->disable_fragments 5599 val = (sctp_sk(sk)->disable_fragments == 1);
5566 if (put_user(len, optlen)) 5600 if (put_user(len, optlen))
5567 return -EFAULT; 5601 return -EFAULT;
5568 if (copy_to_user(optval, &val, len)) 5602 if (copy_to_user(optval, &val, len))
5569 return -EFAULT; 5603 return -EFAULT;
5570 return 0; 5604 return 0;
5571 } 5605 }
5572 5606
5573 /* 7.1.15 Set notification and ancillary even 5607 /* 7.1.15 Set notification and ancillary events (SCTP_EVENTS)
5574 * 5608 *
5575 * This socket option is used to specify vari 5609 * This socket option is used to specify various notifications and
5576 * ancillary data the user wishes to receive. 5610 * ancillary data the user wishes to receive.
5577 */ 5611 */
5578 static int sctp_getsockopt_events(struct sock 5612 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
5579 int __user 5613 int __user *optlen)
5580 { 5614 {
5581 struct sctp_event_subscribe subscribe 5615 struct sctp_event_subscribe subscribe;
5582 __u8 *sn_type = (__u8 *)&subscribe; 5616 __u8 *sn_type = (__u8 *)&subscribe;
5583 int i; 5617 int i;
5584 5618
5585 if (len == 0) 5619 if (len == 0)
5586 return -EINVAL; 5620 return -EINVAL;
5587 if (len > sizeof(struct sctp_event_su 5621 if (len > sizeof(struct sctp_event_subscribe))
5588 len = sizeof(struct sctp_even 5622 len = sizeof(struct sctp_event_subscribe);
5589 if (put_user(len, optlen)) 5623 if (put_user(len, optlen))
5590 return -EFAULT; 5624 return -EFAULT;
5591 5625
5592 for (i = 0; i < len; i++) 5626 for (i = 0; i < len; i++)
5593 sn_type[i] = sctp_ulpevent_ty 5627 sn_type[i] = sctp_ulpevent_type_enabled(sctp_sk(sk)->subscribe,
5594 5628 SCTP_SN_TYPE_BASE + i);
5595 5629
5596 if (copy_to_user(optval, &subscribe, 5630 if (copy_to_user(optval, &subscribe, len))
5597 return -EFAULT; 5631 return -EFAULT;
5598 5632
5599 return 0; 5633 return 0;
5600 } 5634 }
5601 5635
5602 /* 7.1.8 Automatic Close of associations (SCT 5636 /* 7.1.8 Automatic Close of associations (SCTP_AUTOCLOSE)
5603 * 5637 *
5604 * This socket option is applicable to the UD 5638 * This socket option is applicable to the UDP-style socket only. When
5605 * set it will cause associations that are id 5639 * set it will cause associations that are idle for more than the
5606 * specified number of seconds to automatical 5640 * specified number of seconds to automatically close. An association
5607 * being idle is defined an association that 5641 * being idle is defined an association that has NOT sent or received
5608 * user data. The special value of '' indica 5642 * user data. The special value of '' indicates that no automatic
5609 * close of any associations should be perfor 5643 * close of any associations should be performed. The option expects an
5610 * integer defining the number of seconds of 5644 * integer defining the number of seconds of idle time before an
5611 * association is closed. 5645 * association is closed.
5612 */ 5646 */
5613 static int sctp_getsockopt_autoclose(struct s 5647 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
5614 { 5648 {
5615 /* Applicable to UDP-style socket onl 5649 /* Applicable to UDP-style socket only */
5616 if (sctp_style(sk, TCP)) 5650 if (sctp_style(sk, TCP))
5617 return -EOPNOTSUPP; 5651 return -EOPNOTSUPP;
5618 if (len < sizeof(int)) 5652 if (len < sizeof(int))
5619 return -EINVAL; 5653 return -EINVAL;
5620 len = sizeof(int); 5654 len = sizeof(int);
5621 if (put_user(len, optlen)) 5655 if (put_user(len, optlen))
5622 return -EFAULT; 5656 return -EFAULT;
5623 if (put_user(sctp_sk(sk)->autoclose, 5657 if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval))
5624 return -EFAULT; 5658 return -EFAULT;
5625 return 0; 5659 return 0;
5626 } 5660 }
5627 5661
5628 /* Helper routine to branch off an associatio 5662 /* Helper routine to branch off an association to a new socket. */
5629 int sctp_do_peeloff(struct sock *sk, sctp_ass 5663 int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
5630 { 5664 {
5631 struct sctp_association *asoc = sctp_ 5665 struct sctp_association *asoc = sctp_id2assoc(sk, id);
5632 struct sctp_sock *sp = sctp_sk(sk); 5666 struct sctp_sock *sp = sctp_sk(sk);
5633 struct socket *sock; 5667 struct socket *sock;
5634 int err = 0; 5668 int err = 0;
5635 5669
5636 /* Do not peel off from one netns to 5670 /* Do not peel off from one netns to another one. */
5637 if (!net_eq(current->nsproxy->net_ns, 5671 if (!net_eq(current->nsproxy->net_ns, sock_net(sk)))
5638 return -EINVAL; 5672 return -EINVAL;
5639 5673
5640 if (!asoc) 5674 if (!asoc)
5641 return -EINVAL; 5675 return -EINVAL;
5642 5676
5643 /* An association cannot be branched 5677 /* An association cannot be branched off from an already peeled-off
5644 * socket, nor is this supported for 5678 * socket, nor is this supported for tcp style sockets.
5645 */ 5679 */
5646 if (!sctp_style(sk, UDP)) 5680 if (!sctp_style(sk, UDP))
5647 return -EINVAL; 5681 return -EINVAL;
5648 5682
5649 /* Create a new socket. */ 5683 /* Create a new socket. */
5650 err = sock_create(sk->sk_family, SOCK 5684 err = sock_create(sk->sk_family, SOCK_SEQPACKET, IPPROTO_SCTP, &sock);
5651 if (err < 0) 5685 if (err < 0)
5652 return err; 5686 return err;
5653 5687
5654 sctp_copy_sock(sock->sk, sk, asoc); 5688 sctp_copy_sock(sock->sk, sk, asoc);
5655 5689
5656 /* Make peeled-off sockets more like 5690 /* Make peeled-off sockets more like 1-1 accepted sockets.
5657 * Set the daddr and initialize id to 5691 * Set the daddr and initialize id to something more random and also
5658 * copy over any ip options. 5692 * copy over any ip options.
5659 */ 5693 */
5660 sp->pf->to_sk_daddr(&asoc->peer.prima 5694 sp->pf->to_sk_daddr(&asoc->peer.primary_addr, sock->sk);
5661 sp->pf->copy_ip_options(sk, sock->sk) 5695 sp->pf->copy_ip_options(sk, sock->sk);
5662 5696
5663 /* Populate the fields of the newsk f 5697 /* Populate the fields of the newsk from the oldsk and migrate the
5664 * asoc to the newsk. 5698 * asoc to the newsk.
5665 */ 5699 */
5666 err = sctp_sock_migrate(sk, sock->sk, 5700 err = sctp_sock_migrate(sk, sock->sk, asoc,
5667 SCTP_SOCKET_U 5701 SCTP_SOCKET_UDP_HIGH_BANDWIDTH);
5668 if (err) { 5702 if (err) {
5669 sock_release(sock); 5703 sock_release(sock);
5670 sock = NULL; 5704 sock = NULL;
5671 } 5705 }
5672 5706
5673 *sockp = sock; 5707 *sockp = sock;
5674 5708
5675 return err; 5709 return err;
5676 } 5710 }
5677 EXPORT_SYMBOL(sctp_do_peeloff); 5711 EXPORT_SYMBOL(sctp_do_peeloff);
5678 5712
5679 static int sctp_getsockopt_peeloff_common(str 5713 static int sctp_getsockopt_peeloff_common(struct sock *sk, sctp_peeloff_arg_t *peeloff,
5680 str 5714 struct file **newfile, unsigned flags)
5681 { 5715 {
5682 struct socket *newsock; 5716 struct socket *newsock;
5683 int retval; 5717 int retval;
5684 5718
5685 retval = sctp_do_peeloff(sk, peeloff- 5719 retval = sctp_do_peeloff(sk, peeloff->associd, &newsock);
5686 if (retval < 0) 5720 if (retval < 0)
5687 goto out; 5721 goto out;
5688 5722
5689 /* Map the socket to an unused fd tha 5723 /* Map the socket to an unused fd that can be returned to the user. */
5690 retval = get_unused_fd_flags(flags & 5724 retval = get_unused_fd_flags(flags & SOCK_CLOEXEC);
5691 if (retval < 0) { 5725 if (retval < 0) {
5692 sock_release(newsock); 5726 sock_release(newsock);
5693 goto out; 5727 goto out;
5694 } 5728 }
5695 5729
5696 *newfile = sock_alloc_file(newsock, 0 5730 *newfile = sock_alloc_file(newsock, 0, NULL);
5697 if (IS_ERR(*newfile)) { 5731 if (IS_ERR(*newfile)) {
5698 put_unused_fd(retval); 5732 put_unused_fd(retval);
5699 retval = PTR_ERR(*newfile); 5733 retval = PTR_ERR(*newfile);
5700 *newfile = NULL; 5734 *newfile = NULL;
5701 return retval; 5735 return retval;
5702 } 5736 }
5703 5737
5704 pr_debug("%s: sk:%p, newsk:%p, sd:%d\ 5738 pr_debug("%s: sk:%p, newsk:%p, sd:%d\n", __func__, sk, newsock->sk,
5705 retval); 5739 retval);
5706 5740
5707 peeloff->sd = retval; 5741 peeloff->sd = retval;
5708 5742
5709 if (flags & SOCK_NONBLOCK) 5743 if (flags & SOCK_NONBLOCK)
5710 (*newfile)->f_flags |= O_NONB 5744 (*newfile)->f_flags |= O_NONBLOCK;
5711 out: 5745 out:
5712 return retval; 5746 return retval;
5713 } 5747 }
5714 5748
5715 static int sctp_getsockopt_peeloff(struct soc 5749 static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval, int __user *optlen)
5716 { 5750 {
5717 sctp_peeloff_arg_t peeloff; 5751 sctp_peeloff_arg_t peeloff;
5718 struct file *newfile = NULL; 5752 struct file *newfile = NULL;
5719 int retval = 0; 5753 int retval = 0;
5720 5754
5721 if (len < sizeof(sctp_peeloff_arg_t)) 5755 if (len < sizeof(sctp_peeloff_arg_t))
5722 return -EINVAL; 5756 return -EINVAL;
5723 len = sizeof(sctp_peeloff_arg_t); 5757 len = sizeof(sctp_peeloff_arg_t);
5724 if (copy_from_user(&peeloff, optval, 5758 if (copy_from_user(&peeloff, optval, len))
5725 return -EFAULT; 5759 return -EFAULT;
5726 5760
5727 retval = sctp_getsockopt_peeloff_comm 5761 retval = sctp_getsockopt_peeloff_common(sk, &peeloff, &newfile, 0);
5728 if (retval < 0) 5762 if (retval < 0)
5729 goto out; 5763 goto out;
5730 5764
5731 /* Return the fd mapped to the new so 5765 /* Return the fd mapped to the new socket. */
5732 if (put_user(len, optlen)) { 5766 if (put_user(len, optlen)) {
5733 fput(newfile); 5767 fput(newfile);
5734 put_unused_fd(retval); 5768 put_unused_fd(retval);
5735 return -EFAULT; 5769 return -EFAULT;
5736 } 5770 }
5737 5771
5738 if (copy_to_user(optval, &peeloff, le 5772 if (copy_to_user(optval, &peeloff, len)) {
5739 fput(newfile); 5773 fput(newfile);
5740 put_unused_fd(retval); 5774 put_unused_fd(retval);
5741 return -EFAULT; 5775 return -EFAULT;
5742 } 5776 }
5743 fd_install(retval, newfile); 5777 fd_install(retval, newfile);
5744 out: 5778 out:
5745 return retval; 5779 return retval;
5746 } 5780 }
5747 5781
5748 static int sctp_getsockopt_peeloff_flags(stru 5782 static int sctp_getsockopt_peeloff_flags(struct sock *sk, int len,
5749 char 5783 char __user *optval, int __user *optlen)
5750 { 5784 {
5751 sctp_peeloff_flags_arg_t peeloff; 5785 sctp_peeloff_flags_arg_t peeloff;
5752 struct file *newfile = NULL; 5786 struct file *newfile = NULL;
5753 int retval = 0; 5787 int retval = 0;
5754 5788
5755 if (len < sizeof(sctp_peeloff_flags_a 5789 if (len < sizeof(sctp_peeloff_flags_arg_t))
5756 return -EINVAL; 5790 return -EINVAL;
5757 len = sizeof(sctp_peeloff_flags_arg_t 5791 len = sizeof(sctp_peeloff_flags_arg_t);
5758 if (copy_from_user(&peeloff, optval, 5792 if (copy_from_user(&peeloff, optval, len))
5759 return -EFAULT; 5793 return -EFAULT;
5760 5794
5761 retval = sctp_getsockopt_peeloff_comm 5795 retval = sctp_getsockopt_peeloff_common(sk, &peeloff.p_arg,
5762 5796 &newfile, peeloff.flags);
5763 if (retval < 0) 5797 if (retval < 0)
5764 goto out; 5798 goto out;
5765 5799
5766 /* Return the fd mapped to the new so 5800 /* Return the fd mapped to the new socket. */
5767 if (put_user(len, optlen)) { 5801 if (put_user(len, optlen)) {
5768 fput(newfile); 5802 fput(newfile);
5769 put_unused_fd(retval); 5803 put_unused_fd(retval);
5770 return -EFAULT; 5804 return -EFAULT;
5771 } 5805 }
5772 5806
5773 if (copy_to_user(optval, &peeloff, le 5807 if (copy_to_user(optval, &peeloff, len)) {
5774 fput(newfile); 5808 fput(newfile);
5775 put_unused_fd(retval); 5809 put_unused_fd(retval);
5776 return -EFAULT; 5810 return -EFAULT;
5777 } 5811 }
5778 fd_install(retval, newfile); 5812 fd_install(retval, newfile);
5779 out: 5813 out:
5780 return retval; 5814 return retval;
5781 } 5815 }
5782 5816
5783 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ 5817 /* 7.1.13 Peer Address Parameters (SCTP_PEER_ADDR_PARAMS)
5784 * 5818 *
5785 * Applications can enable or disable heartbe 5819 * Applications can enable or disable heartbeats for any peer address of
5786 * an association, modify an address's heartb 5820 * an association, modify an address's heartbeat interval, force a
5787 * heartbeat to be sent immediately, and adju 5821 * heartbeat to be sent immediately, and adjust the address's maximum
5788 * number of retransmissions sent before an a 5822 * number of retransmissions sent before an address is considered
5789 * unreachable. The following structure is u 5823 * unreachable. The following structure is used to access and modify an
5790 * address's parameters: 5824 * address's parameters:
5791 * 5825 *
5792 * struct sctp_paddrparams { 5826 * struct sctp_paddrparams {
5793 * sctp_assoc_t spp_assoc_id; 5827 * sctp_assoc_t spp_assoc_id;
5794 * struct sockaddr_storage spp_address; 5828 * struct sockaddr_storage spp_address;
5795 * uint32_t spp_hbinterval 5829 * uint32_t spp_hbinterval;
5796 * uint16_t spp_pathmaxrxt 5830 * uint16_t spp_pathmaxrxt;
5797 * uint32_t spp_pathmtu; 5831 * uint32_t spp_pathmtu;
5798 * uint32_t spp_sackdelay; 5832 * uint32_t spp_sackdelay;
5799 * uint32_t spp_flags; 5833 * uint32_t spp_flags;
5800 * }; 5834 * };
5801 * 5835 *
5802 * spp_assoc_id - (one-to-many style soc 5836 * spp_assoc_id - (one-to-many style socket) This is filled in the
5803 * application, and ident 5837 * application, and identifies the association for
5804 * this query. 5838 * this query.
5805 * spp_address - This specifies which a 5839 * spp_address - This specifies which address is of interest.
5806 * spp_hbinterval - This contains the valu 5840 * spp_hbinterval - This contains the value of the heartbeat interval,
5807 * in milliseconds. If a 5841 * in milliseconds. If a value of zero
5808 * is present in this fie 5842 * is present in this field then no changes are to
5809 * be made to this parame 5843 * be made to this parameter.
5810 * spp_pathmaxrxt - This contains the maxi 5844 * spp_pathmaxrxt - This contains the maximum number of
5811 * retransmissions before 5845 * retransmissions before this address shall be
5812 * considered unreachable 5846 * considered unreachable. If a value of zero
5813 * is present in this fie 5847 * is present in this field then no changes are to
5814 * be made to this parame 5848 * be made to this parameter.
5815 * spp_pathmtu - When Path MTU discover 5849 * spp_pathmtu - When Path MTU discovery is disabled the value
5816 * specified here will be 5850 * specified here will be the "fixed" path mtu.
5817 * Note that if the spp_a 5851 * Note that if the spp_address field is empty
5818 * then all associations 5852 * then all associations on this address will
5819 * have this fixed path m 5853 * have this fixed path mtu set upon them.
5820 * 5854 *
5821 * spp_sackdelay - When delayed sack is e 5855 * spp_sackdelay - When delayed sack is enabled, this value specifies
5822 * the number of millisec 5856 * the number of milliseconds that sacks will be delayed
5823 * for. This value will a 5857 * for. This value will apply to all addresses of an
5824 * association if the spp 5858 * association if the spp_address field is empty. Note
5825 * also, that if delayed 5859 * also, that if delayed sack is enabled and this
5826 * value is set to 0, no 5860 * value is set to 0, no change is made to the last
5827 * recorded delayed sack 5861 * recorded delayed sack timer value.
5828 * 5862 *
5829 * spp_flags - These flags are used t 5863 * spp_flags - These flags are used to control various features
5830 * on an association. The 5864 * on an association. The flag field may contain
5831 * zero or more of the fo 5865 * zero or more of the following options.
5832 * 5866 *
5833 * SPP_HB_ENABLE - Enabl 5867 * SPP_HB_ENABLE - Enable heartbeats on the
5834 * specified address. Not 5868 * specified address. Note that if the address
5835 * field is empty all add 5869 * field is empty all addresses for the association
5836 * have heartbeats enable 5870 * have heartbeats enabled upon them.
5837 * 5871 *
5838 * SPP_HB_DISABLE - Disab 5872 * SPP_HB_DISABLE - Disable heartbeats on the
5839 * speicifed address. Not 5873 * speicifed address. Note that if the address
5840 * field is empty all add 5874 * field is empty all addresses for the association
5841 * will have their heartb 5875 * will have their heartbeats disabled. Note also
5842 * that SPP_HB_ENABLE and 5876 * that SPP_HB_ENABLE and SPP_HB_DISABLE are
5843 * mutually exclusive, on 5877 * mutually exclusive, only one of these two should
5844 * be specified. Enabling 5878 * be specified. Enabling both fields will have
5845 * undetermined results. 5879 * undetermined results.
5846 * 5880 *
5847 * SPP_HB_DEMAND - Reques 5881 * SPP_HB_DEMAND - Request a user initiated heartbeat
5848 * to be made immediately 5882 * to be made immediately.
5849 * 5883 *
5850 * SPP_PMTUD_ENABLE - Thi 5884 * SPP_PMTUD_ENABLE - This field will enable PMTU
5851 * discovery upon the spe 5885 * discovery upon the specified address. Note that
5852 * if the address feild i 5886 * if the address feild is empty then all addresses
5853 * on the association are 5887 * on the association are effected.
5854 * 5888 *
5855 * SPP_PMTUD_DISABLE - Th 5889 * SPP_PMTUD_DISABLE - This field will disable PMTU
5856 * discovery upon the spe 5890 * discovery upon the specified address. Note that
5857 * if the address feild i 5891 * if the address feild is empty then all addresses
5858 * on the association are 5892 * on the association are effected. Not also that
5859 * SPP_PMTUD_ENABLE and S 5893 * SPP_PMTUD_ENABLE and SPP_PMTUD_DISABLE are mutually
5860 * exclusive. Enabling bo 5894 * exclusive. Enabling both will have undetermined
5861 * results. 5895 * results.
5862 * 5896 *
5863 * SPP_SACKDELAY_ENABLE - 5897 * SPP_SACKDELAY_ENABLE - Setting this flag turns
5864 * on delayed sack. The t 5898 * on delayed sack. The time specified in spp_sackdelay
5865 * is used to specify the 5899 * is used to specify the sack delay for this address. Note
5866 * that if spp_address is 5900 * that if spp_address is empty then all addresses will
5867 * enable delayed sack an 5901 * enable delayed sack and take on the sack delay
5868 * value specified in spp 5902 * value specified in spp_sackdelay.
5869 * SPP_SACKDELAY_DISABLE 5903 * SPP_SACKDELAY_DISABLE - Setting this flag turns
5870 * off delayed sack. If t 5904 * off delayed sack. If the spp_address field is blank then
5871 * delayed sack is disabl 5905 * delayed sack is disabled for the entire association. Note
5872 * also that this field i 5906 * also that this field is mutually exclusive to
5873 * SPP_SACKDELAY_ENABLE, 5907 * SPP_SACKDELAY_ENABLE, setting both will have undefined
5874 * results. 5908 * results.
5875 * 5909 *
5876 * SPP_IPV6_FLOWLABEL: S 5910 * SPP_IPV6_FLOWLABEL: Setting this flag enables the
5877 * setting of the IPV6 fl 5911 * setting of the IPV6 flow label value. The value is
5878 * contained in the spp_i 5912 * contained in the spp_ipv6_flowlabel field.
5879 * Upon retrieval, this f 5913 * Upon retrieval, this flag will be set to indicate that
5880 * the spp_ipv6_flowlabel 5914 * the spp_ipv6_flowlabel field has a valid value returned.
5881 * If a specific destinat 5915 * If a specific destination address is set (in the
5882 * spp_address field), th 5916 * spp_address field), then the value returned is that of
5883 * the address. If just 5917 * the address. If just an association is specified (and
5884 * no address), then the 5918 * no address), then the association's default flow label
5885 * is returned. If neith 5919 * is returned. If neither an association nor a destination
5886 * is specified, then the 5920 * is specified, then the socket's default flow label is
5887 * returned. For non-IPv 5921 * returned. For non-IPv6 sockets, this flag will be left
5888 * cleared. 5922 * cleared.
5889 * 5923 *
5890 * SPP_DSCP: Setting thi 5924 * SPP_DSCP: Setting this flag enables the setting of the
5891 * Differentiated Service 5925 * Differentiated Services Code Point (DSCP) value
5892 * associated with either 5926 * associated with either the association or a specific
5893 * address. The value is 5927 * address. The value is obtained in the spp_dscp field.
5894 * Upon retrieval, this f 5928 * Upon retrieval, this flag will be set to indicate that
5895 * the spp_dscp field has 5929 * the spp_dscp field has a valid value returned. If a
5896 * specific destination a 5930 * specific destination address is set when called (in the
5897 * spp_address field), th 5931 * spp_address field), then that specific destination
5898 * address's DSCP value i 5932 * address's DSCP value is returned. If just an association
5899 * is specified, then the 5933 * is specified, then the association's default DSCP is
5900 * returned. If neither 5934 * returned. If neither an association nor a destination is
5901 * specified, then the so 5935 * specified, then the socket's default DSCP is returned.
5902 * 5936 *
5903 * spp_ipv6_flowlabel 5937 * spp_ipv6_flowlabel
5904 * - This field is used in 5938 * - This field is used in conjunction with the
5905 * SPP_IPV6_FLOWLABEL fla 5939 * SPP_IPV6_FLOWLABEL flag and contains the IPv6 flow label.
5906 * The 20 least significa 5940 * The 20 least significant bits are used for the flow
5907 * label. This setting h 5941 * label. This setting has precedence over any IPv6-layer
5908 * setting. 5942 * setting.
5909 * 5943 *
5910 * spp_dscp - This field is used in 5944 * spp_dscp - This field is used in conjunction with the SPP_DSCP flag
5911 * and contains the DSCP. 5945 * and contains the DSCP. The 6 most significant bits are
5912 * used for the DSCP. Th 5946 * used for the DSCP. This setting has precedence over any
5913 * IPv4- or IPv6- layer s 5947 * IPv4- or IPv6- layer setting.
5914 */ 5948 */
5915 static int sctp_getsockopt_peer_addr_params(s 5949 static int sctp_getsockopt_peer_addr_params(struct sock *sk, int len,
5916 c 5950 char __user *optval, int __user *optlen)
5917 { 5951 {
5918 struct sctp_paddrparams params; 5952 struct sctp_paddrparams params;
5919 struct sctp_transport *trans = NULL 5953 struct sctp_transport *trans = NULL;
5920 struct sctp_association *asoc = NULL; 5954 struct sctp_association *asoc = NULL;
5921 struct sctp_sock *sp = sctp_sk 5955 struct sctp_sock *sp = sctp_sk(sk);
5922 5956
5923 if (len >= sizeof(params)) 5957 if (len >= sizeof(params))
5924 len = sizeof(params); 5958 len = sizeof(params);
5925 else if (len >= ALIGN(offsetof(struct 5959 else if (len >= ALIGN(offsetof(struct sctp_paddrparams,
5926 spp_ip 5960 spp_ipv6_flowlabel), 4))
5927 len = ALIGN(offsetof(struct s 5961 len = ALIGN(offsetof(struct sctp_paddrparams,
5928 spp_ipv6 5962 spp_ipv6_flowlabel), 4);
5929 else 5963 else
5930 return -EINVAL; 5964 return -EINVAL;
5931 5965
5932 if (copy_from_user(¶ms, optval, l 5966 if (copy_from_user(¶ms, optval, len))
5933 return -EFAULT; 5967 return -EFAULT;
5934 5968
5935 /* If an address other than INADDR_AN 5969 /* If an address other than INADDR_ANY is specified, and
5936 * no transport is found, then the re 5970 * no transport is found, then the request is invalid.
5937 */ 5971 */
5938 if (!sctp_is_any(sk, (union sctp_addr 5972 if (!sctp_is_any(sk, (union sctp_addr *)¶ms.spp_address)) {
5939 trans = sctp_addr_id2transpor 5973 trans = sctp_addr_id2transport(sk, ¶ms.spp_address,
5940 5974 params.spp_assoc_id);
5941 if (!trans) { 5975 if (!trans) {
5942 pr_debug("%s: failed 5976 pr_debug("%s: failed no transport\n", __func__);
5943 return -EINVAL; 5977 return -EINVAL;
5944 } 5978 }
5945 } 5979 }
5946 5980
5947 /* Get association, if assoc_id != SC 5981 /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
5948 * socket is a one to many style sock 5982 * socket is a one to many style socket, and an association
5949 * was not found, then the id was inv 5983 * was not found, then the id was invalid.
5950 */ 5984 */
5951 asoc = sctp_id2assoc(sk, params.spp_a 5985 asoc = sctp_id2assoc(sk, params.spp_assoc_id);
5952 if (!asoc && params.spp_assoc_id != S 5986 if (!asoc && params.spp_assoc_id != SCTP_FUTURE_ASSOC &&
5953 sctp_style(sk, UDP)) { 5987 sctp_style(sk, UDP)) {
5954 pr_debug("%s: failed no assoc 5988 pr_debug("%s: failed no association\n", __func__);
5955 return -EINVAL; 5989 return -EINVAL;
5956 } 5990 }
5957 5991
5958 if (trans) { 5992 if (trans) {
5959 /* Fetch transport values. */ 5993 /* Fetch transport values. */
5960 params.spp_hbinterval = jiffi 5994 params.spp_hbinterval = jiffies_to_msecs(trans->hbinterval);
5961 params.spp_pathmtu = trans 5995 params.spp_pathmtu = trans->pathmtu;
5962 params.spp_pathmaxrxt = trans 5996 params.spp_pathmaxrxt = trans->pathmaxrxt;
5963 params.spp_sackdelay = jiffi 5997 params.spp_sackdelay = jiffies_to_msecs(trans->sackdelay);
5964 5998
5965 /*draft-11 doesn't say what t 5999 /*draft-11 doesn't say what to return in spp_flags*/
5966 params.spp_flags = trans 6000 params.spp_flags = trans->param_flags;
5967 if (trans->flowlabel & SCTP_F 6001 if (trans->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
5968 params.spp_ipv6_flowl 6002 params.spp_ipv6_flowlabel = trans->flowlabel &
5969 6003 SCTP_FLOWLABEL_VAL_MASK;
5970 params.spp_flags |= S 6004 params.spp_flags |= SPP_IPV6_FLOWLABEL;
5971 } 6005 }
5972 if (trans->dscp & SCTP_DSCP_S 6006 if (trans->dscp & SCTP_DSCP_SET_MASK) {
5973 params.spp_dscp = tra 6007 params.spp_dscp = trans->dscp & SCTP_DSCP_VAL_MASK;
5974 params.spp_flags |= S 6008 params.spp_flags |= SPP_DSCP;
5975 } 6009 }
5976 } else if (asoc) { 6010 } else if (asoc) {
5977 /* Fetch association values. 6011 /* Fetch association values. */
5978 params.spp_hbinterval = jiffi 6012 params.spp_hbinterval = jiffies_to_msecs(asoc->hbinterval);
5979 params.spp_pathmtu = asoc- 6013 params.spp_pathmtu = asoc->pathmtu;
5980 params.spp_pathmaxrxt = asoc- 6014 params.spp_pathmaxrxt = asoc->pathmaxrxt;
5981 params.spp_sackdelay = jiffi 6015 params.spp_sackdelay = jiffies_to_msecs(asoc->sackdelay);
5982 6016
5983 /*draft-11 doesn't say what t 6017 /*draft-11 doesn't say what to return in spp_flags*/
5984 params.spp_flags = asoc- 6018 params.spp_flags = asoc->param_flags;
5985 if (asoc->flowlabel & SCTP_FL 6019 if (asoc->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
5986 params.spp_ipv6_flowl 6020 params.spp_ipv6_flowlabel = asoc->flowlabel &
5987 6021 SCTP_FLOWLABEL_VAL_MASK;
5988 params.spp_flags |= S 6022 params.spp_flags |= SPP_IPV6_FLOWLABEL;
5989 } 6023 }
5990 if (asoc->dscp & SCTP_DSCP_SE 6024 if (asoc->dscp & SCTP_DSCP_SET_MASK) {
5991 params.spp_dscp = aso 6025 params.spp_dscp = asoc->dscp & SCTP_DSCP_VAL_MASK;
5992 params.spp_flags |= S 6026 params.spp_flags |= SPP_DSCP;
5993 } 6027 }
5994 } else { 6028 } else {
5995 /* Fetch socket values. */ 6029 /* Fetch socket values. */
5996 params.spp_hbinterval = sp->h 6030 params.spp_hbinterval = sp->hbinterval;
5997 params.spp_pathmtu = sp->p 6031 params.spp_pathmtu = sp->pathmtu;
5998 params.spp_sackdelay = sp->s 6032 params.spp_sackdelay = sp->sackdelay;
5999 params.spp_pathmaxrxt = sp->p 6033 params.spp_pathmaxrxt = sp->pathmaxrxt;
6000 6034
6001 /*draft-11 doesn't say what t 6035 /*draft-11 doesn't say what to return in spp_flags*/
6002 params.spp_flags = sp->p 6036 params.spp_flags = sp->param_flags;
6003 if (sp->flowlabel & SCTP_FLOW 6037 if (sp->flowlabel & SCTP_FLOWLABEL_SET_MASK) {
6004 params.spp_ipv6_flowl 6038 params.spp_ipv6_flowlabel = sp->flowlabel &
6005 6039 SCTP_FLOWLABEL_VAL_MASK;
6006 params.spp_flags |= S 6040 params.spp_flags |= SPP_IPV6_FLOWLABEL;
6007 } 6041 }
6008 if (sp->dscp & SCTP_DSCP_SET_ 6042 if (sp->dscp & SCTP_DSCP_SET_MASK) {
6009 params.spp_dscp = sp- 6043 params.spp_dscp = sp->dscp & SCTP_DSCP_VAL_MASK;
6010 params.spp_flags |= S 6044 params.spp_flags |= SPP_DSCP;
6011 } 6045 }
6012 } 6046 }
6013 6047
6014 if (copy_to_user(optval, ¶ms, len 6048 if (copy_to_user(optval, ¶ms, len))
6015 return -EFAULT; 6049 return -EFAULT;
6016 6050
6017 if (put_user(len, optlen)) 6051 if (put_user(len, optlen))
6018 return -EFAULT; 6052 return -EFAULT;
6019 6053
6020 return 0; 6054 return 0;
6021 } 6055 }
6022 6056
6023 /* 6057 /*
6024 * 7.1.23. Get or set delayed ack timer (SCT 6058 * 7.1.23. Get or set delayed ack timer (SCTP_DELAYED_SACK)
6025 * 6059 *
6026 * This option will effect the way delayed ac 6060 * This option will effect the way delayed acks are performed. This
6027 * option allows you to get or set the delaye 6061 * option allows you to get or set the delayed ack time, in
6028 * milliseconds. It also allows changing the 6062 * milliseconds. It also allows changing the delayed ack frequency.
6029 * Changing the frequency to 1 disables the d 6063 * Changing the frequency to 1 disables the delayed sack algorithm. If
6030 * the assoc_id is 0, then this sets or gets 6064 * the assoc_id is 0, then this sets or gets the endpoints default
6031 * values. If the assoc_id field is non-zero 6065 * values. If the assoc_id field is non-zero, then the set or get
6032 * effects the specified association for the 6066 * effects the specified association for the one to many model (the
6033 * assoc_id field is ignored by the one to on 6067 * assoc_id field is ignored by the one to one model). Note that if
6034 * sack_delay or sack_freq are 0 when setting 6068 * sack_delay or sack_freq are 0 when setting this option, then the
6035 * current values will remain unchanged. 6069 * current values will remain unchanged.
6036 * 6070 *
6037 * struct sctp_sack_info { 6071 * struct sctp_sack_info {
6038 * sctp_assoc_t sack_assoc_id; 6072 * sctp_assoc_t sack_assoc_id;
6039 * uint32_t sack_delay; 6073 * uint32_t sack_delay;
6040 * uint32_t sack_freq; 6074 * uint32_t sack_freq;
6041 * }; 6075 * };
6042 * 6076 *
6043 * sack_assoc_id - This parameter, indicates 6077 * sack_assoc_id - This parameter, indicates which association the user
6044 * is performing an action upon. Note tha 6078 * is performing an action upon. Note that if this field's value is
6045 * zero then the endpoints default value i 6079 * zero then the endpoints default value is changed (effecting future
6046 * associations only). 6080 * associations only).
6047 * 6081 *
6048 * sack_delay - This parameter contains the 6082 * sack_delay - This parameter contains the number of milliseconds that
6049 * the user is requesting the delayed ACK 6083 * the user is requesting the delayed ACK timer be set to. Note that
6050 * this value is defined in the standard t 6084 * this value is defined in the standard to be between 200 and 500
6051 * milliseconds. 6085 * milliseconds.
6052 * 6086 *
6053 * sack_freq - This parameter contains the n 6087 * sack_freq - This parameter contains the number of packets that must
6054 * be received before a sack is sent witho 6088 * be received before a sack is sent without waiting for the delay
6055 * timer to expire. The default value for 6089 * timer to expire. The default value for this is 2, setting this
6056 * value to 1 will disable the delayed sac 6090 * value to 1 will disable the delayed sack algorithm.
6057 */ 6091 */
6058 static int sctp_getsockopt_delayed_ack(struct 6092 static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
6059 c 6093 char __user *optval,
6060 i 6094 int __user *optlen)
6061 { 6095 {
6062 struct sctp_sack_info params; 6096 struct sctp_sack_info params;
6063 struct sctp_association *asoc = NULL; 6097 struct sctp_association *asoc = NULL;
6064 struct sctp_sock *sp = sctp_sk 6098 struct sctp_sock *sp = sctp_sk(sk);
6065 6099
6066 if (len >= sizeof(struct sctp_sack_in 6100 if (len >= sizeof(struct sctp_sack_info)) {
6067 len = sizeof(struct sctp_sack 6101 len = sizeof(struct sctp_sack_info);
6068 6102
6069 if (copy_from_user(¶ms, o 6103 if (copy_from_user(¶ms, optval, len))
6070 return -EFAULT; 6104 return -EFAULT;
6071 } else if (len == sizeof(struct sctp_ 6105 } else if (len == sizeof(struct sctp_assoc_value)) {
6072 pr_warn_ratelimited(DEPRECATE 6106 pr_warn_ratelimited(DEPRECATED
6073 "%s (pid 6107 "%s (pid %d) "
6074 "Use of s 6108 "Use of struct sctp_assoc_value in delayed_ack socket option.\n"
6075 "Use stru 6109 "Use struct sctp_sack_info instead\n",
6076 current-> 6110 current->comm, task_pid_nr(current));
6077 if (copy_from_user(¶ms, o 6111 if (copy_from_user(¶ms, optval, len))
6078 return -EFAULT; 6112 return -EFAULT;
6079 } else 6113 } else
6080 return -EINVAL; 6114 return -EINVAL;
6081 6115
6082 /* Get association, if sack_assoc_id 6116 /* Get association, if sack_assoc_id != SCTP_FUTURE_ASSOC and the
6083 * socket is a one to many style sock 6117 * socket is a one to many style socket, and an association
6084 * was not found, then the id was inv 6118 * was not found, then the id was invalid.
6085 */ 6119 */
6086 asoc = sctp_id2assoc(sk, params.sack_ 6120 asoc = sctp_id2assoc(sk, params.sack_assoc_id);
6087 if (!asoc && params.sack_assoc_id != 6121 if (!asoc && params.sack_assoc_id != SCTP_FUTURE_ASSOC &&
6088 sctp_style(sk, UDP)) 6122 sctp_style(sk, UDP))
6089 return -EINVAL; 6123 return -EINVAL;
6090 6124
6091 if (asoc) { 6125 if (asoc) {
6092 /* Fetch association values. 6126 /* Fetch association values. */
6093 if (asoc->param_flags & SPP_S 6127 if (asoc->param_flags & SPP_SACKDELAY_ENABLE) {
6094 params.sack_delay = j 6128 params.sack_delay = jiffies_to_msecs(asoc->sackdelay);
6095 params.sack_freq = as 6129 params.sack_freq = asoc->sackfreq;
6096 6130
6097 } else { 6131 } else {
6098 params.sack_delay = 0 6132 params.sack_delay = 0;
6099 params.sack_freq = 1; 6133 params.sack_freq = 1;
6100 } 6134 }
6101 } else { 6135 } else {
6102 /* Fetch socket values. */ 6136 /* Fetch socket values. */
6103 if (sp->param_flags & SPP_SAC 6137 if (sp->param_flags & SPP_SACKDELAY_ENABLE) {
6104 params.sack_delay = 6138 params.sack_delay = sp->sackdelay;
6105 params.sack_freq = sp 6139 params.sack_freq = sp->sackfreq;
6106 } else { 6140 } else {
6107 params.sack_delay = 6141 params.sack_delay = 0;
6108 params.sack_freq = 1; 6142 params.sack_freq = 1;
6109 } 6143 }
6110 } 6144 }
6111 6145
6112 if (copy_to_user(optval, ¶ms, len 6146 if (copy_to_user(optval, ¶ms, len))
6113 return -EFAULT; 6147 return -EFAULT;
6114 6148
6115 if (put_user(len, optlen)) 6149 if (put_user(len, optlen))
6116 return -EFAULT; 6150 return -EFAULT;
6117 6151
6118 return 0; 6152 return 0;
6119 } 6153 }
6120 6154
6121 /* 7.1.3 Initialization Parameters (SCTP_INIT 6155 /* 7.1.3 Initialization Parameters (SCTP_INITMSG)
6122 * 6156 *
6123 * Applications can specify protocol paramete 6157 * Applications can specify protocol parameters for the default association
6124 * initialization. The option name argument 6158 * initialization. The option name argument to setsockopt() and getsockopt()
6125 * is SCTP_INITMSG. 6159 * is SCTP_INITMSG.
6126 * 6160 *
6127 * Setting initialization parameters is effec 6161 * Setting initialization parameters is effective only on an unconnected
6128 * socket (for UDP-style sockets only future 6162 * socket (for UDP-style sockets only future associations are effected
6129 * by the change). With TCP-style sockets, t 6163 * by the change). With TCP-style sockets, this option is inherited by
6130 * sockets derived from a listener socket. 6164 * sockets derived from a listener socket.
6131 */ 6165 */
6132 static int sctp_getsockopt_initmsg(struct soc 6166 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
6133 { 6167 {
6134 if (len < sizeof(struct sctp_initmsg) 6168 if (len < sizeof(struct sctp_initmsg))
6135 return -EINVAL; 6169 return -EINVAL;
6136 len = sizeof(struct sctp_initmsg); 6170 len = sizeof(struct sctp_initmsg);
6137 if (put_user(len, optlen)) 6171 if (put_user(len, optlen))
6138 return -EFAULT; 6172 return -EFAULT;
6139 if (copy_to_user(optval, &sctp_sk(sk) 6173 if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
6140 return -EFAULT; 6174 return -EFAULT;
6141 return 0; 6175 return 0;
6142 } 6176 }
6143 6177
6144 6178
6145 static int sctp_getsockopt_peer_addrs(struct 6179 static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
6146 char __ 6180 char __user *optval, int __user *optlen)
6147 { 6181 {
6148 struct sctp_association *asoc; 6182 struct sctp_association *asoc;
6149 int cnt = 0; 6183 int cnt = 0;
6150 struct sctp_getaddrs getaddrs; 6184 struct sctp_getaddrs getaddrs;
6151 struct sctp_transport *from; 6185 struct sctp_transport *from;
6152 void __user *to; 6186 void __user *to;
6153 union sctp_addr temp; 6187 union sctp_addr temp;
6154 struct sctp_sock *sp = sctp_sk(sk); 6188 struct sctp_sock *sp = sctp_sk(sk);
6155 int addrlen; 6189 int addrlen;
6156 size_t space_left; 6190 size_t space_left;
6157 int bytes_copied; 6191 int bytes_copied;
6158 6192
6159 if (len < sizeof(struct sctp_getaddrs 6193 if (len < sizeof(struct sctp_getaddrs))
6160 return -EINVAL; 6194 return -EINVAL;
6161 6195
6162 if (copy_from_user(&getaddrs, optval, 6196 if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
6163 return -EFAULT; 6197 return -EFAULT;
6164 6198
6165 /* For UDP-style sockets, id specifie 6199 /* For UDP-style sockets, id specifies the association to query. */
6166 asoc = sctp_id2assoc(sk, getaddrs.ass 6200 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
6167 if (!asoc) 6201 if (!asoc)
6168 return -EINVAL; 6202 return -EINVAL;
6169 6203
6170 to = optval + offsetof(struct sctp_ge 6204 to = optval + offsetof(struct sctp_getaddrs, addrs);
6171 space_left = len - offsetof(struct sc 6205 space_left = len - offsetof(struct sctp_getaddrs, addrs);
6172 6206
6173 list_for_each_entry(from, &asoc->peer 6207 list_for_each_entry(from, &asoc->peer.transport_addr_list,
6174 transports) { 6208 transports) {
6175 memcpy(&temp, &from->ipaddr, 6209 memcpy(&temp, &from->ipaddr, sizeof(temp));
6176 addrlen = sctp_get_pf_specifi 6210 addrlen = sctp_get_pf_specific(sk->sk_family)
6177 ->addr_to_user( 6211 ->addr_to_user(sp, &temp);
6178 if (space_left < addrlen) 6212 if (space_left < addrlen)
6179 return -ENOMEM; 6213 return -ENOMEM;
6180 if (copy_to_user(to, &temp, a 6214 if (copy_to_user(to, &temp, addrlen))
6181 return -EFAULT; 6215 return -EFAULT;
6182 to += addrlen; 6216 to += addrlen;
6183 cnt++; 6217 cnt++;
6184 space_left -= addrlen; 6218 space_left -= addrlen;
6185 } 6219 }
6186 6220
6187 if (put_user(cnt, &((struct sctp_geta 6221 if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
6188 return -EFAULT; 6222 return -EFAULT;
6189 bytes_copied = ((char __user *)to) - 6223 bytes_copied = ((char __user *)to) - optval;
6190 if (put_user(bytes_copied, optlen)) 6224 if (put_user(bytes_copied, optlen))
6191 return -EFAULT; 6225 return -EFAULT;
6192 6226
6193 return 0; 6227 return 0;
6194 } 6228 }
6195 6229
6196 static int sctp_copy_laddrs(struct sock *sk, 6230 static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
6197 size_t space_left 6231 size_t space_left, int *bytes_copied)
6198 { 6232 {
6199 struct sctp_sockaddr_entry *addr; 6233 struct sctp_sockaddr_entry *addr;
6200 union sctp_addr temp; 6234 union sctp_addr temp;
6201 int cnt = 0; 6235 int cnt = 0;
6202 int addrlen; 6236 int addrlen;
6203 struct net *net = sock_net(sk); 6237 struct net *net = sock_net(sk);
6204 6238
6205 rcu_read_lock(); 6239 rcu_read_lock();
6206 list_for_each_entry_rcu(addr, &net->s 6240 list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) {
6207 if (!addr->valid) 6241 if (!addr->valid)
6208 continue; 6242 continue;
6209 6243
6210 if ((PF_INET == sk->sk_family 6244 if ((PF_INET == sk->sk_family) &&
6211 (AF_INET6 == addr->a.sa.s 6245 (AF_INET6 == addr->a.sa.sa_family))
6212 continue; 6246 continue;
6213 if ((PF_INET6 == sk->sk_famil 6247 if ((PF_INET6 == sk->sk_family) &&
6214 inet_v6_ipv6only(sk) && 6248 inet_v6_ipv6only(sk) &&
6215 (AF_INET == addr->a.sa.sa 6249 (AF_INET == addr->a.sa.sa_family))
6216 continue; 6250 continue;
6217 memcpy(&temp, &addr->a, sizeo 6251 memcpy(&temp, &addr->a, sizeof(temp));
6218 if (!temp.v4.sin_port) 6252 if (!temp.v4.sin_port)
6219 temp.v4.sin_port = ht 6253 temp.v4.sin_port = htons(port);
6220 6254
6221 addrlen = sctp_get_pf_specifi 6255 addrlen = sctp_get_pf_specific(sk->sk_family)
6222 ->addr_to_user( 6256 ->addr_to_user(sctp_sk(sk), &temp);
6223 6257
6224 if (space_left < addrlen) { 6258 if (space_left < addrlen) {
6225 cnt = -ENOMEM; 6259 cnt = -ENOMEM;
6226 break; 6260 break;
6227 } 6261 }
6228 memcpy(to, &temp, addrlen); 6262 memcpy(to, &temp, addrlen);
6229 6263
6230 to += addrlen; 6264 to += addrlen;
6231 cnt++; 6265 cnt++;
6232 space_left -= addrlen; 6266 space_left -= addrlen;
6233 *bytes_copied += addrlen; 6267 *bytes_copied += addrlen;
6234 } 6268 }
6235 rcu_read_unlock(); 6269 rcu_read_unlock();
6236 6270
6237 return cnt; 6271 return cnt;
6238 } 6272 }
6239 6273
6240 6274
6241 static int sctp_getsockopt_local_addrs(struct 6275 static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
6242 char _ 6276 char __user *optval, int __user *optlen)
6243 { 6277 {
6244 struct sctp_bind_addr *bp; 6278 struct sctp_bind_addr *bp;
6245 struct sctp_association *asoc; 6279 struct sctp_association *asoc;
6246 int cnt = 0; 6280 int cnt = 0;
6247 struct sctp_getaddrs getaddrs; 6281 struct sctp_getaddrs getaddrs;
6248 struct sctp_sockaddr_entry *addr; 6282 struct sctp_sockaddr_entry *addr;
6249 void __user *to; 6283 void __user *to;
6250 union sctp_addr temp; 6284 union sctp_addr temp;
6251 struct sctp_sock *sp = sctp_sk(sk); 6285 struct sctp_sock *sp = sctp_sk(sk);
6252 int addrlen; 6286 int addrlen;
6253 int err = 0; 6287 int err = 0;
6254 size_t space_left; 6288 size_t space_left;
6255 int bytes_copied = 0; 6289 int bytes_copied = 0;
6256 void *addrs; 6290 void *addrs;
6257 void *buf; 6291 void *buf;
6258 6292
6259 if (len < sizeof(struct sctp_getaddrs 6293 if (len < sizeof(struct sctp_getaddrs))
6260 return -EINVAL; 6294 return -EINVAL;
6261 6295
6262 if (copy_from_user(&getaddrs, optval, 6296 if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
6263 return -EFAULT; 6297 return -EFAULT;
6264 6298
6265 /* 6299 /*
6266 * For UDP-style sockets, id specifi 6300 * For UDP-style sockets, id specifies the association to query.
6267 * If the id field is set to the val 6301 * If the id field is set to the value '' then the locally bound
6268 * addresses are returned without re 6302 * addresses are returned without regard to any particular
6269 * association. 6303 * association.
6270 */ 6304 */
6271 if (0 == getaddrs.assoc_id) { 6305 if (0 == getaddrs.assoc_id) {
6272 bp = &sctp_sk(sk)->ep->base.b 6306 bp = &sctp_sk(sk)->ep->base.bind_addr;
6273 } else { 6307 } else {
6274 asoc = sctp_id2assoc(sk, geta 6308 asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
6275 if (!asoc) 6309 if (!asoc)
6276 return -EINVAL; 6310 return -EINVAL;
6277 bp = &asoc->base.bind_addr; 6311 bp = &asoc->base.bind_addr;
6278 } 6312 }
6279 6313
6280 to = optval + offsetof(struct sctp_ge 6314 to = optval + offsetof(struct sctp_getaddrs, addrs);
6281 space_left = len - offsetof(struct sc 6315 space_left = len - offsetof(struct sctp_getaddrs, addrs);
6282 6316
6283 addrs = kmalloc(space_left, GFP_USER 6317 addrs = kmalloc(space_left, GFP_USER | __GFP_NOWARN);
6284 if (!addrs) 6318 if (!addrs)
6285 return -ENOMEM; 6319 return -ENOMEM;
6286 6320
6287 /* If the endpoint is bound to 0.0.0. 6321 /* If the endpoint is bound to 0.0.0.0 or ::0, get the valid
6288 * addresses from the global local ad 6322 * addresses from the global local address list.
6289 */ 6323 */
6290 if (sctp_list_single_entry(&bp->addre 6324 if (sctp_list_single_entry(&bp->address_list)) {
6291 addr = list_entry(bp->address 6325 addr = list_entry(bp->address_list.next,
6292 struct sctp 6326 struct sctp_sockaddr_entry, list);
6293 if (sctp_is_any(sk, &addr->a) 6327 if (sctp_is_any(sk, &addr->a)) {
6294 cnt = sctp_copy_laddr 6328 cnt = sctp_copy_laddrs(sk, bp->port, addrs,
6295 6329 space_left, &bytes_copied);
6296 if (cnt < 0) { 6330 if (cnt < 0) {
6297 err = cnt; 6331 err = cnt;
6298 goto out; 6332 goto out;
6299 } 6333 }
6300 goto copy_getaddrs; 6334 goto copy_getaddrs;
6301 } 6335 }
6302 } 6336 }
6303 6337
6304 buf = addrs; 6338 buf = addrs;
6305 /* Protection on the bound address li 6339 /* Protection on the bound address list is not needed since
6306 * in the socket option context we ho 6340 * in the socket option context we hold a socket lock and
6307 * thus the bound address list can't 6341 * thus the bound address list can't change.
6308 */ 6342 */
6309 list_for_each_entry(addr, &bp->addres 6343 list_for_each_entry(addr, &bp->address_list, list) {
6310 memcpy(&temp, &addr->a, sizeo 6344 memcpy(&temp, &addr->a, sizeof(temp));
6311 addrlen = sctp_get_pf_specifi 6345 addrlen = sctp_get_pf_specific(sk->sk_family)
6312 ->addr_to_user( 6346 ->addr_to_user(sp, &temp);
6313 if (space_left < addrlen) { 6347 if (space_left < addrlen) {
6314 err = -ENOMEM; /*fix 6348 err = -ENOMEM; /*fixme: right error?*/
6315 goto out; 6349 goto out;
6316 } 6350 }
6317 memcpy(buf, &temp, addrlen); 6351 memcpy(buf, &temp, addrlen);
6318 buf += addrlen; 6352 buf += addrlen;
6319 bytes_copied += addrlen; 6353 bytes_copied += addrlen;
6320 cnt++; 6354 cnt++;
6321 space_left -= addrlen; 6355 space_left -= addrlen;
6322 } 6356 }
6323 6357
6324 copy_getaddrs: 6358 copy_getaddrs:
6325 if (copy_to_user(to, addrs, bytes_cop 6359 if (copy_to_user(to, addrs, bytes_copied)) {
6326 err = -EFAULT; 6360 err = -EFAULT;
6327 goto out; 6361 goto out;
6328 } 6362 }
6329 if (put_user(cnt, &((struct sctp_geta 6363 if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num)) {
6330 err = -EFAULT; 6364 err = -EFAULT;
6331 goto out; 6365 goto out;
6332 } 6366 }
6333 /* XXX: We should have accounted for 6367 /* XXX: We should have accounted for sizeof(struct sctp_getaddrs) too,
6334 * but we can't change it anymore. 6368 * but we can't change it anymore.
6335 */ 6369 */
6336 if (put_user(bytes_copied, optlen)) 6370 if (put_user(bytes_copied, optlen))
6337 err = -EFAULT; 6371 err = -EFAULT;
6338 out: 6372 out:
6339 kfree(addrs); 6373 kfree(addrs);
6340 return err; 6374 return err;
6341 } 6375 }
6342 6376
6343 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_A 6377 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
6344 * 6378 *
6345 * Requests that the local SCTP stack use the 6379 * Requests that the local SCTP stack use the enclosed peer address as
6346 * the association primary. The enclosed add 6380 * the association primary. The enclosed address must be one of the
6347 * association peer's addresses. 6381 * association peer's addresses.
6348 */ 6382 */
6349 static int sctp_getsockopt_primary_addr(struc 6383 static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
6350 char 6384 char __user *optval, int __user *optlen)
6351 { 6385 {
6352 struct sctp_prim prim; 6386 struct sctp_prim prim;
6353 struct sctp_association *asoc; 6387 struct sctp_association *asoc;
6354 struct sctp_sock *sp = sctp_sk(sk); 6388 struct sctp_sock *sp = sctp_sk(sk);
6355 6389
6356 if (len < sizeof(struct sctp_prim)) 6390 if (len < sizeof(struct sctp_prim))
6357 return -EINVAL; 6391 return -EINVAL;
6358 6392
6359 len = sizeof(struct sctp_prim); 6393 len = sizeof(struct sctp_prim);
6360 6394
6361 if (copy_from_user(&prim, optval, len 6395 if (copy_from_user(&prim, optval, len))
6362 return -EFAULT; 6396 return -EFAULT;
6363 6397
6364 asoc = sctp_id2assoc(sk, prim.ssp_ass 6398 asoc = sctp_id2assoc(sk, prim.ssp_assoc_id);
6365 if (!asoc) 6399 if (!asoc)
6366 return -EINVAL; 6400 return -EINVAL;
6367 6401
6368 if (!asoc->peer.primary_path) 6402 if (!asoc->peer.primary_path)
6369 return -ENOTCONN; 6403 return -ENOTCONN;
6370 6404
6371 memcpy(&prim.ssp_addr, &asoc->peer.pr 6405 memcpy(&prim.ssp_addr, &asoc->peer.primary_path->ipaddr,
6372 asoc->peer.primary_path->af_s 6406 asoc->peer.primary_path->af_specific->sockaddr_len);
6373 6407
6374 sctp_get_pf_specific(sk->sk_family)-> 6408 sctp_get_pf_specific(sk->sk_family)->addr_to_user(sp,
6375 (union sctp_addr *)&p 6409 (union sctp_addr *)&prim.ssp_addr);
6376 6410
6377 if (put_user(len, optlen)) 6411 if (put_user(len, optlen))
6378 return -EFAULT; 6412 return -EFAULT;
6379 if (copy_to_user(optval, &prim, len)) 6413 if (copy_to_user(optval, &prim, len))
6380 return -EFAULT; 6414 return -EFAULT;
6381 6415
6382 return 0; 6416 return 0;
6383 } 6417 }
6384 6418
6385 /* 6419 /*
6386 * 7.1.11 Set Adaptation Layer Indicator (SC 6420 * 7.1.11 Set Adaptation Layer Indicator (SCTP_ADAPTATION_LAYER)
6387 * 6421 *
6388 * Requests that the local endpoint set the s 6422 * Requests that the local endpoint set the specified Adaptation Layer
6389 * Indication parameter for all future INIT a 6423 * Indication parameter for all future INIT and INIT-ACK exchanges.
6390 */ 6424 */
6391 static int sctp_getsockopt_adaptation_layer(s 6425 static int sctp_getsockopt_adaptation_layer(struct sock *sk, int len,
6392 char __user 6426 char __user *optval, int __user *optlen)
6393 { 6427 {
6394 struct sctp_setadaptation adaptation; 6428 struct sctp_setadaptation adaptation;
6395 6429
6396 if (len < sizeof(struct sctp_setadapt 6430 if (len < sizeof(struct sctp_setadaptation))
6397 return -EINVAL; 6431 return -EINVAL;
6398 6432
6399 len = sizeof(struct sctp_setadaptatio 6433 len = sizeof(struct sctp_setadaptation);
6400 6434
6401 adaptation.ssb_adaptation_ind = sctp_ 6435 adaptation.ssb_adaptation_ind = sctp_sk(sk)->adaptation_ind;
6402 6436
6403 if (put_user(len, optlen)) 6437 if (put_user(len, optlen))
6404 return -EFAULT; 6438 return -EFAULT;
6405 if (copy_to_user(optval, &adaptation, 6439 if (copy_to_user(optval, &adaptation, len))
6406 return -EFAULT; 6440 return -EFAULT;
6407 6441
6408 return 0; 6442 return 0;
6409 } 6443 }
6410 6444
6411 /* 6445 /*
6412 * 6446 *
6413 * 7.1.14 Set default send parameters (SCTP_D 6447 * 7.1.14 Set default send parameters (SCTP_DEFAULT_SEND_PARAM)
6414 * 6448 *
6415 * Applications that wish to use the sendto 6449 * Applications that wish to use the sendto() system call may wish to
6416 * specify a default set of parameters that 6450 * specify a default set of parameters that would normally be supplied
6417 * through the inclusion of ancillary data. 6451 * through the inclusion of ancillary data. This socket option allows
6418 * such an application to set the default s 6452 * such an application to set the default sctp_sndrcvinfo structure.
6419 6453
6420 6454
6421 * The application that wishes to use this 6455 * The application that wishes to use this socket option simply passes
6422 * in to this call the sctp_sndrcvinfo stru 6456 * in to this call the sctp_sndrcvinfo structure defined in Section
6423 * 5.2.2) The input parameters accepted by 6457 * 5.2.2) The input parameters accepted by this call include
6424 * sinfo_stream, sinfo_flags, sinfo_ppid, s 6458 * sinfo_stream, sinfo_flags, sinfo_ppid, sinfo_context,
6425 * sinfo_timetolive. The user must provide 6459 * sinfo_timetolive. The user must provide the sinfo_assoc_id field in
6426 * to this call if the caller is using the 6460 * to this call if the caller is using the UDP model.
6427 * 6461 *
6428 * For getsockopt, it get the default sctp_ 6462 * For getsockopt, it get the default sctp_sndrcvinfo structure.
6429 */ 6463 */
6430 static int sctp_getsockopt_default_send_param 6464 static int sctp_getsockopt_default_send_param(struct sock *sk,
6431 int l 6465 int len, char __user *optval,
6432 int _ 6466 int __user *optlen)
6433 { 6467 {
6434 struct sctp_sock *sp = sctp_sk(sk); 6468 struct sctp_sock *sp = sctp_sk(sk);
6435 struct sctp_association *asoc; 6469 struct sctp_association *asoc;
6436 struct sctp_sndrcvinfo info; 6470 struct sctp_sndrcvinfo info;
6437 6471
6438 if (len < sizeof(info)) 6472 if (len < sizeof(info))
6439 return -EINVAL; 6473 return -EINVAL;
6440 6474
6441 len = sizeof(info); 6475 len = sizeof(info);
6442 6476
6443 if (copy_from_user(&info, optval, len 6477 if (copy_from_user(&info, optval, len))
6444 return -EFAULT; 6478 return -EFAULT;
6445 6479
6446 asoc = sctp_id2assoc(sk, info.sinfo_a 6480 asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
6447 if (!asoc && info.sinfo_assoc_id != S 6481 if (!asoc && info.sinfo_assoc_id != SCTP_FUTURE_ASSOC &&
6448 sctp_style(sk, UDP)) 6482 sctp_style(sk, UDP))
6449 return -EINVAL; 6483 return -EINVAL;
6450 6484
6451 if (asoc) { 6485 if (asoc) {
6452 info.sinfo_stream = asoc->def 6486 info.sinfo_stream = asoc->default_stream;
6453 info.sinfo_flags = asoc->defa 6487 info.sinfo_flags = asoc->default_flags;
6454 info.sinfo_ppid = asoc->defau 6488 info.sinfo_ppid = asoc->default_ppid;
6455 info.sinfo_context = asoc->de 6489 info.sinfo_context = asoc->default_context;
6456 info.sinfo_timetolive = asoc- 6490 info.sinfo_timetolive = asoc->default_timetolive;
6457 } else { 6491 } else {
6458 info.sinfo_stream = sp->defau 6492 info.sinfo_stream = sp->default_stream;
6459 info.sinfo_flags = sp->defaul 6493 info.sinfo_flags = sp->default_flags;
6460 info.sinfo_ppid = sp->default 6494 info.sinfo_ppid = sp->default_ppid;
6461 info.sinfo_context = sp->defa 6495 info.sinfo_context = sp->default_context;
6462 info.sinfo_timetolive = sp->d 6496 info.sinfo_timetolive = sp->default_timetolive;
6463 } 6497 }
6464 6498
6465 if (put_user(len, optlen)) 6499 if (put_user(len, optlen))
6466 return -EFAULT; 6500 return -EFAULT;
6467 if (copy_to_user(optval, &info, len)) 6501 if (copy_to_user(optval, &info, len))
6468 return -EFAULT; 6502 return -EFAULT;
6469 6503
6470 return 0; 6504 return 0;
6471 } 6505 }
6472 6506
6473 /* RFC6458, Section 8.1.31. Set/get Default S 6507 /* RFC6458, Section 8.1.31. Set/get Default Send Parameters
6474 * (SCTP_DEFAULT_SNDINFO) 6508 * (SCTP_DEFAULT_SNDINFO)
6475 */ 6509 */
6476 static int sctp_getsockopt_default_sndinfo(st 6510 static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len,
6477 ch 6511 char __user *optval,
6478 in 6512 int __user *optlen)
6479 { 6513 {
6480 struct sctp_sock *sp = sctp_sk(sk); 6514 struct sctp_sock *sp = sctp_sk(sk);
6481 struct sctp_association *asoc; 6515 struct sctp_association *asoc;
6482 struct sctp_sndinfo info; 6516 struct sctp_sndinfo info;
6483 6517
6484 if (len < sizeof(info)) 6518 if (len < sizeof(info))
6485 return -EINVAL; 6519 return -EINVAL;
6486 6520
6487 len = sizeof(info); 6521 len = sizeof(info);
6488 6522
6489 if (copy_from_user(&info, optval, len 6523 if (copy_from_user(&info, optval, len))
6490 return -EFAULT; 6524 return -EFAULT;
6491 6525
6492 asoc = sctp_id2assoc(sk, info.snd_ass 6526 asoc = sctp_id2assoc(sk, info.snd_assoc_id);
6493 if (!asoc && info.snd_assoc_id != SCT 6527 if (!asoc && info.snd_assoc_id != SCTP_FUTURE_ASSOC &&
6494 sctp_style(sk, UDP)) 6528 sctp_style(sk, UDP))
6495 return -EINVAL; 6529 return -EINVAL;
6496 6530
6497 if (asoc) { 6531 if (asoc) {
6498 info.snd_sid = asoc->default_ 6532 info.snd_sid = asoc->default_stream;
6499 info.snd_flags = asoc->defaul 6533 info.snd_flags = asoc->default_flags;
6500 info.snd_ppid = asoc->default 6534 info.snd_ppid = asoc->default_ppid;
6501 info.snd_context = asoc->defa 6535 info.snd_context = asoc->default_context;
6502 } else { 6536 } else {
6503 info.snd_sid = sp->default_st 6537 info.snd_sid = sp->default_stream;
6504 info.snd_flags = sp->default_ 6538 info.snd_flags = sp->default_flags;
6505 info.snd_ppid = sp->default_p 6539 info.snd_ppid = sp->default_ppid;
6506 info.snd_context = sp->defaul 6540 info.snd_context = sp->default_context;
6507 } 6541 }
6508 6542
6509 if (put_user(len, optlen)) 6543 if (put_user(len, optlen))
6510 return -EFAULT; 6544 return -EFAULT;
6511 if (copy_to_user(optval, &info, len)) 6545 if (copy_to_user(optval, &info, len))
6512 return -EFAULT; 6546 return -EFAULT;
6513 6547
6514 return 0; 6548 return 0;
6515 } 6549 }
6516 6550
6517 /* 6551 /*
6518 * 6552 *
6519 * 7.1.5 SCTP_NODELAY 6553 * 7.1.5 SCTP_NODELAY
6520 * 6554 *
6521 * Turn on/off any Nagle-like algorithm. Thi 6555 * Turn on/off any Nagle-like algorithm. This means that packets are
6522 * generally sent as soon as possible and no 6556 * generally sent as soon as possible and no unnecessary delays are
6523 * introduced, at the cost of more packets in 6557 * introduced, at the cost of more packets in the network. Expects an
6524 * integer boolean flag. 6558 * integer boolean flag.
6525 */ 6559 */
6526 6560
6527 static int sctp_getsockopt_nodelay(struct soc 6561 static int sctp_getsockopt_nodelay(struct sock *sk, int len,
6528 char __use 6562 char __user *optval, int __user *optlen)
6529 { 6563 {
6530 int val; 6564 int val;
6531 6565
6532 if (len < sizeof(int)) 6566 if (len < sizeof(int))
6533 return -EINVAL; 6567 return -EINVAL;
6534 6568
6535 len = sizeof(int); 6569 len = sizeof(int);
6536 val = (sctp_sk(sk)->nodelay == 1); 6570 val = (sctp_sk(sk)->nodelay == 1);
6537 if (put_user(len, optlen)) 6571 if (put_user(len, optlen))
6538 return -EFAULT; 6572 return -EFAULT;
6539 if (copy_to_user(optval, &val, len)) 6573 if (copy_to_user(optval, &val, len))
6540 return -EFAULT; 6574 return -EFAULT;
6541 return 0; 6575 return 0;
6542 } 6576 }
6543 6577
6544 /* 6578 /*
6545 * 6579 *
6546 * 7.1.1 SCTP_RTOINFO 6580 * 7.1.1 SCTP_RTOINFO
6547 * 6581 *
6548 * The protocol parameters used to initialize 6582 * The protocol parameters used to initialize and bound retransmission
6549 * timeout (RTO) are tunable. sctp_rtoinfo st 6583 * timeout (RTO) are tunable. sctp_rtoinfo structure is used to access
6550 * and modify these parameters. 6584 * and modify these parameters.
6551 * All parameters are time values, in millise 6585 * All parameters are time values, in milliseconds. A value of 0, when
6552 * modifying the parameters, indicates that t 6586 * modifying the parameters, indicates that the current value should not
6553 * be changed. 6587 * be changed.
6554 * 6588 *
6555 */ 6589 */
6556 static int sctp_getsockopt_rtoinfo(struct soc 6590 static int sctp_getsockopt_rtoinfo(struct sock *sk, int len,
6557 char __user * 6591 char __user *optval,
6558 int __user *o 6592 int __user *optlen) {
6559 struct sctp_rtoinfo rtoinfo; 6593 struct sctp_rtoinfo rtoinfo;
6560 struct sctp_association *asoc; 6594 struct sctp_association *asoc;
6561 6595
6562 if (len < sizeof (struct sctp_rtoinfo 6596 if (len < sizeof (struct sctp_rtoinfo))
6563 return -EINVAL; 6597 return -EINVAL;
6564 6598
6565 len = sizeof(struct sctp_rtoinfo); 6599 len = sizeof(struct sctp_rtoinfo);
6566 6600
6567 if (copy_from_user(&rtoinfo, optval, 6601 if (copy_from_user(&rtoinfo, optval, len))
6568 return -EFAULT; 6602 return -EFAULT;
6569 6603
6570 asoc = sctp_id2assoc(sk, rtoinfo.srto 6604 asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
6571 6605
6572 if (!asoc && rtoinfo.srto_assoc_id != 6606 if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
6573 sctp_style(sk, UDP)) 6607 sctp_style(sk, UDP))
6574 return -EINVAL; 6608 return -EINVAL;
6575 6609
6576 /* Values corresponding to the specif 6610 /* Values corresponding to the specific association. */
6577 if (asoc) { 6611 if (asoc) {
6578 rtoinfo.srto_initial = jiffie 6612 rtoinfo.srto_initial = jiffies_to_msecs(asoc->rto_initial);
6579 rtoinfo.srto_max = jiffies_to 6613 rtoinfo.srto_max = jiffies_to_msecs(asoc->rto_max);
6580 rtoinfo.srto_min = jiffies_to 6614 rtoinfo.srto_min = jiffies_to_msecs(asoc->rto_min);
6581 } else { 6615 } else {
6582 /* Values corresponding to th 6616 /* Values corresponding to the endpoint. */
6583 struct sctp_sock *sp = sctp_s 6617 struct sctp_sock *sp = sctp_sk(sk);
6584 6618
6585 rtoinfo.srto_initial = sp->rt 6619 rtoinfo.srto_initial = sp->rtoinfo.srto_initial;
6586 rtoinfo.srto_max = sp->rtoinf 6620 rtoinfo.srto_max = sp->rtoinfo.srto_max;
6587 rtoinfo.srto_min = sp->rtoinf 6621 rtoinfo.srto_min = sp->rtoinfo.srto_min;
6588 } 6622 }
6589 6623
6590 if (put_user(len, optlen)) 6624 if (put_user(len, optlen))
6591 return -EFAULT; 6625 return -EFAULT;
6592 6626
6593 if (copy_to_user(optval, &rtoinfo, le 6627 if (copy_to_user(optval, &rtoinfo, len))
6594 return -EFAULT; 6628 return -EFAULT;
6595 6629
6596 return 0; 6630 return 0;
6597 } 6631 }
6598 6632
6599 /* 6633 /*
6600 * 6634 *
6601 * 7.1.2 SCTP_ASSOCINFO 6635 * 7.1.2 SCTP_ASSOCINFO
6602 * 6636 *
6603 * This option is used to tune the maximum re 6637 * This option is used to tune the maximum retransmission attempts
6604 * of the association. 6638 * of the association.
6605 * Returns an error if the new association re 6639 * Returns an error if the new association retransmission value is
6606 * greater than the sum of the retransmission 6640 * greater than the sum of the retransmission value of the peer.
6607 * See [SCTP] for more information. 6641 * See [SCTP] for more information.
6608 * 6642 *
6609 */ 6643 */
6610 static int sctp_getsockopt_associnfo(struct s 6644 static int sctp_getsockopt_associnfo(struct sock *sk, int len,
6611 char __u 6645 char __user *optval,
6612 int __us 6646 int __user *optlen)
6613 { 6647 {
6614 6648
6615 struct sctp_assocparams assocparams; 6649 struct sctp_assocparams assocparams;
6616 struct sctp_association *asoc; 6650 struct sctp_association *asoc;
6617 struct list_head *pos; 6651 struct list_head *pos;
6618 int cnt = 0; 6652 int cnt = 0;
6619 6653
6620 if (len < sizeof (struct sctp_assocpa 6654 if (len < sizeof (struct sctp_assocparams))
6621 return -EINVAL; 6655 return -EINVAL;
6622 6656
6623 len = sizeof(struct sctp_assocparams) 6657 len = sizeof(struct sctp_assocparams);
6624 6658
6625 if (copy_from_user(&assocparams, optv 6659 if (copy_from_user(&assocparams, optval, len))
6626 return -EFAULT; 6660 return -EFAULT;
6627 6661
6628 asoc = sctp_id2assoc(sk, assocparams. 6662 asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
6629 6663
6630 if (!asoc && assocparams.sasoc_assoc_ 6664 if (!asoc && assocparams.sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
6631 sctp_style(sk, UDP)) 6665 sctp_style(sk, UDP))
6632 return -EINVAL; 6666 return -EINVAL;
6633 6667
6634 /* Values correspoinding to the speci 6668 /* Values correspoinding to the specific association */
6635 if (asoc) { 6669 if (asoc) {
6636 assocparams.sasoc_asocmaxrxt 6670 assocparams.sasoc_asocmaxrxt = asoc->max_retrans;
6637 assocparams.sasoc_peer_rwnd = 6671 assocparams.sasoc_peer_rwnd = asoc->peer.rwnd;
6638 assocparams.sasoc_local_rwnd 6672 assocparams.sasoc_local_rwnd = asoc->a_rwnd;
6639 assocparams.sasoc_cookie_life 6673 assocparams.sasoc_cookie_life = ktime_to_ms(asoc->cookie_life);
6640 6674
6641 list_for_each(pos, &asoc->pee 6675 list_for_each(pos, &asoc->peer.transport_addr_list) {
6642 cnt++; 6676 cnt++;
6643 } 6677 }
6644 6678
6645 assocparams.sasoc_number_peer 6679 assocparams.sasoc_number_peer_destinations = cnt;
6646 } else { 6680 } else {
6647 /* Values corresponding to th 6681 /* Values corresponding to the endpoint */
6648 struct sctp_sock *sp = sctp_s 6682 struct sctp_sock *sp = sctp_sk(sk);
6649 6683
6650 assocparams.sasoc_asocmaxrxt 6684 assocparams.sasoc_asocmaxrxt = sp->assocparams.sasoc_asocmaxrxt;
6651 assocparams.sasoc_peer_rwnd = 6685 assocparams.sasoc_peer_rwnd = sp->assocparams.sasoc_peer_rwnd;
6652 assocparams.sasoc_local_rwnd 6686 assocparams.sasoc_local_rwnd = sp->assocparams.sasoc_local_rwnd;
6653 assocparams.sasoc_cookie_life 6687 assocparams.sasoc_cookie_life =
6654 sp->a 6688 sp->assocparams.sasoc_cookie_life;
6655 assocparams.sasoc_number_peer 6689 assocparams.sasoc_number_peer_destinations =
6656 sp->a 6690 sp->assocparams.
6657 sasoc 6691 sasoc_number_peer_destinations;
6658 } 6692 }
6659 6693
6660 if (put_user(len, optlen)) 6694 if (put_user(len, optlen))
6661 return -EFAULT; 6695 return -EFAULT;
6662 6696
6663 if (copy_to_user(optval, &assocparams 6697 if (copy_to_user(optval, &assocparams, len))
6664 return -EFAULT; 6698 return -EFAULT;
6665 6699
6666 return 0; 6700 return 0;
6667 } 6701 }
6668 6702
6669 /* 6703 /*
6670 * 7.1.16 Set/clear IPv4 mapped addresses (SC 6704 * 7.1.16 Set/clear IPv4 mapped addresses (SCTP_I_WANT_MAPPED_V4_ADDR)
6671 * 6705 *
6672 * This socket option is a boolean flag which 6706 * This socket option is a boolean flag which turns on or off mapped V4
6673 * addresses. If this option is turned on an 6707 * addresses. If this option is turned on and the socket is type
6674 * PF_INET6, then IPv4 addresses will be mapp 6708 * PF_INET6, then IPv4 addresses will be mapped to V6 representation.
6675 * If this option is turned off, then no mapp 6709 * If this option is turned off, then no mapping will be done of V4
6676 * addresses and a user will receive both PF_ 6710 * addresses and a user will receive both PF_INET6 and PF_INET type
6677 * addresses on the socket. 6711 * addresses on the socket.
6678 */ 6712 */
6679 static int sctp_getsockopt_mappedv4(struct so 6713 static int sctp_getsockopt_mappedv4(struct sock *sk, int len,
6680 char __us 6714 char __user *optval, int __user *optlen)
6681 { 6715 {
6682 int val; 6716 int val;
6683 struct sctp_sock *sp = sctp_sk(sk); 6717 struct sctp_sock *sp = sctp_sk(sk);
6684 6718
6685 if (len < sizeof(int)) 6719 if (len < sizeof(int))
6686 return -EINVAL; 6720 return -EINVAL;
6687 6721
6688 len = sizeof(int); 6722 len = sizeof(int);
6689 val = sp->v4mapped; 6723 val = sp->v4mapped;
6690 if (put_user(len, optlen)) 6724 if (put_user(len, optlen))
6691 return -EFAULT; 6725 return -EFAULT;
6692 if (copy_to_user(optval, &val, len)) 6726 if (copy_to_user(optval, &val, len))
6693 return -EFAULT; 6727 return -EFAULT;
6694 6728
6695 return 0; 6729 return 0;
6696 } 6730 }
6697 6731
6698 /* 6732 /*
6699 * 7.1.29. Set or Get the default context (S 6733 * 7.1.29. Set or Get the default context (SCTP_CONTEXT)
6700 * (chapter and verse is quoted at sctp_setso 6734 * (chapter and verse is quoted at sctp_setsockopt_context())
6701 */ 6735 */
6702 static int sctp_getsockopt_context(struct soc 6736 static int sctp_getsockopt_context(struct sock *sk, int len,
6703 char __use 6737 char __user *optval, int __user *optlen)
6704 { 6738 {
6705 struct sctp_assoc_value params; 6739 struct sctp_assoc_value params;
6706 struct sctp_association *asoc; 6740 struct sctp_association *asoc;
6707 6741
6708 if (len < sizeof(struct sctp_assoc_va 6742 if (len < sizeof(struct sctp_assoc_value))
6709 return -EINVAL; 6743 return -EINVAL;
6710 6744
6711 len = sizeof(struct sctp_assoc_value) 6745 len = sizeof(struct sctp_assoc_value);
6712 6746
6713 if (copy_from_user(¶ms, optval, l 6747 if (copy_from_user(¶ms, optval, len))
6714 return -EFAULT; 6748 return -EFAULT;
6715 6749
6716 asoc = sctp_id2assoc(sk, params.assoc 6750 asoc = sctp_id2assoc(sk, params.assoc_id);
6717 if (!asoc && params.assoc_id != SCTP_ 6751 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6718 sctp_style(sk, UDP)) 6752 sctp_style(sk, UDP))
6719 return -EINVAL; 6753 return -EINVAL;
6720 6754
6721 params.assoc_value = asoc ? asoc->def 6755 params.assoc_value = asoc ? asoc->default_rcv_context
6722 : sctp_sk(s 6756 : sctp_sk(sk)->default_rcv_context;
6723 6757
6724 if (put_user(len, optlen)) 6758 if (put_user(len, optlen))
6725 return -EFAULT; 6759 return -EFAULT;
6726 if (copy_to_user(optval, ¶ms, len 6760 if (copy_to_user(optval, ¶ms, len))
6727 return -EFAULT; 6761 return -EFAULT;
6728 6762
6729 return 0; 6763 return 0;
6730 } 6764 }
6731 6765
6732 /* 6766 /*
6733 * 8.1.16. Get or Set the Maximum Fragmentat 6767 * 8.1.16. Get or Set the Maximum Fragmentation Size (SCTP_MAXSEG)
6734 * This option will get or set the maximum si 6768 * This option will get or set the maximum size to put in any outgoing
6735 * SCTP DATA chunk. If a message is larger t 6769 * SCTP DATA chunk. If a message is larger than this size it will be
6736 * fragmented by SCTP into the specified size 6770 * fragmented by SCTP into the specified size. Note that the underlying
6737 * SCTP implementation may fragment into smal 6771 * SCTP implementation may fragment into smaller sized chunks when the
6738 * PMTU of the underlying association is smal 6772 * PMTU of the underlying association is smaller than the value set by
6739 * the user. The default value for this opti 6773 * the user. The default value for this option is '' which indicates
6740 * the user is NOT limiting fragmentation and 6774 * the user is NOT limiting fragmentation and only the PMTU will effect
6741 * SCTP's choice of DATA chunk size. Note al 6775 * SCTP's choice of DATA chunk size. Note also that values set larger
6742 * than the maximum size of an IP datagram wi 6776 * than the maximum size of an IP datagram will effectively let SCTP
6743 * control fragmentation (i.e. the same as se 6777 * control fragmentation (i.e. the same as setting this option to 0).
6744 * 6778 *
6745 * The following structure is used to access 6779 * The following structure is used to access and modify this parameter:
6746 * 6780 *
6747 * struct sctp_assoc_value { 6781 * struct sctp_assoc_value {
6748 * sctp_assoc_t assoc_id; 6782 * sctp_assoc_t assoc_id;
6749 * uint32_t assoc_value; 6783 * uint32_t assoc_value;
6750 * }; 6784 * };
6751 * 6785 *
6752 * assoc_id: This parameter is ignored for o 6786 * assoc_id: This parameter is ignored for one-to-one style sockets.
6753 * For one-to-many style sockets this para 6787 * For one-to-many style sockets this parameter indicates which
6754 * association the user is performing an a 6788 * association the user is performing an action upon. Note that if
6755 * this field's value is zero then the end 6789 * this field's value is zero then the endpoints default value is
6756 * changed (effecting future associations 6790 * changed (effecting future associations only).
6757 * assoc_value: This parameter specifies the 6791 * assoc_value: This parameter specifies the maximum size in bytes.
6758 */ 6792 */
6759 static int sctp_getsockopt_maxseg(struct sock 6793 static int sctp_getsockopt_maxseg(struct sock *sk, int len,
6760 char __user 6794 char __user *optval, int __user *optlen)
6761 { 6795 {
6762 struct sctp_assoc_value params; 6796 struct sctp_assoc_value params;
6763 struct sctp_association *asoc; 6797 struct sctp_association *asoc;
6764 6798
6765 if (len == sizeof(int)) { 6799 if (len == sizeof(int)) {
6766 pr_warn_ratelimited(DEPRECATE 6800 pr_warn_ratelimited(DEPRECATED
6767 "%s (pid 6801 "%s (pid %d) "
6768 "Use of i 6802 "Use of int in maxseg socket option.\n"
6769 "Use stru 6803 "Use struct sctp_assoc_value instead\n",
6770 current-> 6804 current->comm, task_pid_nr(current));
6771 params.assoc_id = SCTP_FUTURE 6805 params.assoc_id = SCTP_FUTURE_ASSOC;
6772 } else if (len >= sizeof(struct sctp_ 6806 } else if (len >= sizeof(struct sctp_assoc_value)) {
6773 len = sizeof(struct sctp_asso 6807 len = sizeof(struct sctp_assoc_value);
6774 if (copy_from_user(¶ms, o 6808 if (copy_from_user(¶ms, optval, len))
6775 return -EFAULT; 6809 return -EFAULT;
6776 } else 6810 } else
6777 return -EINVAL; 6811 return -EINVAL;
6778 6812
6779 asoc = sctp_id2assoc(sk, params.assoc 6813 asoc = sctp_id2assoc(sk, params.assoc_id);
6780 if (!asoc && params.assoc_id != SCTP_ 6814 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6781 sctp_style(sk, UDP)) 6815 sctp_style(sk, UDP))
6782 return -EINVAL; 6816 return -EINVAL;
6783 6817
6784 if (asoc) 6818 if (asoc)
6785 params.assoc_value = asoc->fr 6819 params.assoc_value = asoc->frag_point;
6786 else 6820 else
6787 params.assoc_value = sctp_sk( 6821 params.assoc_value = sctp_sk(sk)->user_frag;
6788 6822
6789 if (put_user(len, optlen)) 6823 if (put_user(len, optlen))
6790 return -EFAULT; 6824 return -EFAULT;
6791 if (len == sizeof(int)) { 6825 if (len == sizeof(int)) {
6792 if (copy_to_user(optval, &par 6826 if (copy_to_user(optval, ¶ms.assoc_value, len))
6793 return -EFAULT; 6827 return -EFAULT;
6794 } else { 6828 } else {
6795 if (copy_to_user(optval, &par 6829 if (copy_to_user(optval, ¶ms, len))
6796 return -EFAULT; 6830 return -EFAULT;
6797 } 6831 }
6798 6832
6799 return 0; 6833 return 0;
6800 } 6834 }
6801 6835
6802 /* 6836 /*
6803 * 7.1.24. Get or set fragmented interleave 6837 * 7.1.24. Get or set fragmented interleave (SCTP_FRAGMENT_INTERLEAVE)
6804 * (chapter and verse is quoted at sctp_setso 6838 * (chapter and verse is quoted at sctp_setsockopt_fragment_interleave())
6805 */ 6839 */
6806 static int sctp_getsockopt_fragment_interleav 6840 static int sctp_getsockopt_fragment_interleave(struct sock *sk, int len,
6807 6841 char __user *optval, int __user *optlen)
6808 { 6842 {
6809 int val; 6843 int val;
6810 6844
6811 if (len < sizeof(int)) 6845 if (len < sizeof(int))
6812 return -EINVAL; 6846 return -EINVAL;
6813 6847
6814 len = sizeof(int); 6848 len = sizeof(int);
6815 6849
6816 val = sctp_sk(sk)->frag_interleave; 6850 val = sctp_sk(sk)->frag_interleave;
6817 if (put_user(len, optlen)) 6851 if (put_user(len, optlen))
6818 return -EFAULT; 6852 return -EFAULT;
6819 if (copy_to_user(optval, &val, len)) 6853 if (copy_to_user(optval, &val, len))
6820 return -EFAULT; 6854 return -EFAULT;
6821 6855
6822 return 0; 6856 return 0;
6823 } 6857 }
6824 6858
6825 /* 6859 /*
6826 * 7.1.25. Set or Get the sctp partial deliv 6860 * 7.1.25. Set or Get the sctp partial delivery point
6827 * (chapter and verse is quoted at sctp_setso 6861 * (chapter and verse is quoted at sctp_setsockopt_partial_delivery_point())
6828 */ 6862 */
6829 static int sctp_getsockopt_partial_delivery_p 6863 static int sctp_getsockopt_partial_delivery_point(struct sock *sk, int len,
6830 6864 char __user *optval,
6831 6865 int __user *optlen)
6832 { 6866 {
6833 u32 val; 6867 u32 val;
6834 6868
6835 if (len < sizeof(u32)) 6869 if (len < sizeof(u32))
6836 return -EINVAL; 6870 return -EINVAL;
6837 6871
6838 len = sizeof(u32); 6872 len = sizeof(u32);
6839 6873
6840 val = sctp_sk(sk)->pd_point; 6874 val = sctp_sk(sk)->pd_point;
6841 if (put_user(len, optlen)) 6875 if (put_user(len, optlen))
6842 return -EFAULT; 6876 return -EFAULT;
6843 if (copy_to_user(optval, &val, len)) 6877 if (copy_to_user(optval, &val, len))
6844 return -EFAULT; 6878 return -EFAULT;
6845 6879
6846 return 0; 6880 return 0;
6847 } 6881 }
6848 6882
6849 /* 6883 /*
6850 * 7.1.28. Set or Get the maximum burst (SCT 6884 * 7.1.28. Set or Get the maximum burst (SCTP_MAX_BURST)
6851 * (chapter and verse is quoted at sctp_setso 6885 * (chapter and verse is quoted at sctp_setsockopt_maxburst())
6852 */ 6886 */
6853 static int sctp_getsockopt_maxburst(struct so 6887 static int sctp_getsockopt_maxburst(struct sock *sk, int len,
6854 char __us 6888 char __user *optval,
6855 int __use 6889 int __user *optlen)
6856 { 6890 {
6857 struct sctp_assoc_value params; 6891 struct sctp_assoc_value params;
6858 struct sctp_association *asoc; 6892 struct sctp_association *asoc;
6859 6893
6860 if (len == sizeof(int)) { 6894 if (len == sizeof(int)) {
6861 pr_warn_ratelimited(DEPRECATE 6895 pr_warn_ratelimited(DEPRECATED
6862 "%s (pid 6896 "%s (pid %d) "
6863 "Use of i 6897 "Use of int in max_burst socket option.\n"
6864 "Use stru 6898 "Use struct sctp_assoc_value instead\n",
6865 current-> 6899 current->comm, task_pid_nr(current));
6866 params.assoc_id = SCTP_FUTURE 6900 params.assoc_id = SCTP_FUTURE_ASSOC;
6867 } else if (len >= sizeof(struct sctp_ 6901 } else if (len >= sizeof(struct sctp_assoc_value)) {
6868 len = sizeof(struct sctp_asso 6902 len = sizeof(struct sctp_assoc_value);
6869 if (copy_from_user(¶ms, o 6903 if (copy_from_user(¶ms, optval, len))
6870 return -EFAULT; 6904 return -EFAULT;
6871 } else 6905 } else
6872 return -EINVAL; 6906 return -EINVAL;
6873 6907
6874 asoc = sctp_id2assoc(sk, params.assoc 6908 asoc = sctp_id2assoc(sk, params.assoc_id);
6875 if (!asoc && params.assoc_id != SCTP_ 6909 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
6876 sctp_style(sk, UDP)) 6910 sctp_style(sk, UDP))
6877 return -EINVAL; 6911 return -EINVAL;
6878 6912
6879 params.assoc_value = asoc ? asoc->max 6913 params.assoc_value = asoc ? asoc->max_burst : sctp_sk(sk)->max_burst;
6880 6914
6881 if (len == sizeof(int)) { 6915 if (len == sizeof(int)) {
6882 if (copy_to_user(optval, &par 6916 if (copy_to_user(optval, ¶ms.assoc_value, len))
6883 return -EFAULT; 6917 return -EFAULT;
6884 } else { 6918 } else {
6885 if (copy_to_user(optval, &par 6919 if (copy_to_user(optval, ¶ms, len))
6886 return -EFAULT; 6920 return -EFAULT;
6887 } 6921 }
6888 6922
6889 return 0; 6923 return 0;
6890 6924
6891 } 6925 }
6892 6926
6893 static int sctp_getsockopt_hmac_ident(struct 6927 static int sctp_getsockopt_hmac_ident(struct sock *sk, int len,
6894 char __us 6928 char __user *optval, int __user *optlen)
6895 { 6929 {
6896 struct sctp_endpoint *ep = sctp_sk(sk 6930 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
6897 struct sctp_hmacalgo __user *p = (vo 6931 struct sctp_hmacalgo __user *p = (void __user *)optval;
6898 struct sctp_hmac_algo_param *hmacs; 6932 struct sctp_hmac_algo_param *hmacs;
6899 __u16 data_len = 0; 6933 __u16 data_len = 0;
6900 u32 num_idents; 6934 u32 num_idents;
6901 int i; 6935 int i;
6902 6936
6903 if (!ep->auth_enable) 6937 if (!ep->auth_enable)
6904 return -EACCES; 6938 return -EACCES;
6905 6939
6906 hmacs = ep->auth_hmacs_list; 6940 hmacs = ep->auth_hmacs_list;
6907 data_len = ntohs(hmacs->param_hdr.len 6941 data_len = ntohs(hmacs->param_hdr.length) -
6908 sizeof(struct sctp_paramhd 6942 sizeof(struct sctp_paramhdr);
6909 6943
6910 if (len < sizeof(struct sctp_hmacalgo 6944 if (len < sizeof(struct sctp_hmacalgo) + data_len)
6911 return -EINVAL; 6945 return -EINVAL;
6912 6946
6913 len = sizeof(struct sctp_hmacalgo) + 6947 len = sizeof(struct sctp_hmacalgo) + data_len;
6914 num_idents = data_len / sizeof(u16); 6948 num_idents = data_len / sizeof(u16);
6915 6949
6916 if (put_user(len, optlen)) 6950 if (put_user(len, optlen))
6917 return -EFAULT; 6951 return -EFAULT;
6918 if (put_user(num_idents, &p->shmac_nu 6952 if (put_user(num_idents, &p->shmac_num_idents))
6919 return -EFAULT; 6953 return -EFAULT;
6920 for (i = 0; i < num_idents; i++) { 6954 for (i = 0; i < num_idents; i++) {
6921 __u16 hmacid = ntohs(hmacs->h 6955 __u16 hmacid = ntohs(hmacs->hmac_ids[i]);
6922 6956
6923 if (copy_to_user(&p->shmac_id 6957 if (copy_to_user(&p->shmac_idents[i], &hmacid, sizeof(__u16)))
6924 return -EFAULT; 6958 return -EFAULT;
6925 } 6959 }
6926 return 0; 6960 return 0;
6927 } 6961 }
6928 6962
6929 static int sctp_getsockopt_active_key(struct 6963 static int sctp_getsockopt_active_key(struct sock *sk, int len,
6930 char __us 6964 char __user *optval, int __user *optlen)
6931 { 6965 {
6932 struct sctp_endpoint *ep = sctp_sk(sk 6966 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
6933 struct sctp_authkeyid val; 6967 struct sctp_authkeyid val;
6934 struct sctp_association *asoc; 6968 struct sctp_association *asoc;
6935 6969
6936 if (len < sizeof(struct sctp_authkeyi 6970 if (len < sizeof(struct sctp_authkeyid))
6937 return -EINVAL; 6971 return -EINVAL;
6938 6972
6939 len = sizeof(struct sctp_authkeyid); 6973 len = sizeof(struct sctp_authkeyid);
6940 if (copy_from_user(&val, optval, len) 6974 if (copy_from_user(&val, optval, len))
6941 return -EFAULT; 6975 return -EFAULT;
6942 6976
6943 asoc = sctp_id2assoc(sk, val.scact_as 6977 asoc = sctp_id2assoc(sk, val.scact_assoc_id);
6944 if (!asoc && val.scact_assoc_id && sc 6978 if (!asoc && val.scact_assoc_id && sctp_style(sk, UDP))
6945 return -EINVAL; 6979 return -EINVAL;
6946 6980
6947 if (asoc) { 6981 if (asoc) {
6948 if (!asoc->peer.auth_capable) 6982 if (!asoc->peer.auth_capable)
6949 return -EACCES; 6983 return -EACCES;
6950 val.scact_keynumber = asoc->a 6984 val.scact_keynumber = asoc->active_key_id;
6951 } else { 6985 } else {
6952 if (!ep->auth_enable) 6986 if (!ep->auth_enable)
6953 return -EACCES; 6987 return -EACCES;
6954 val.scact_keynumber = ep->act 6988 val.scact_keynumber = ep->active_key_id;
6955 } 6989 }
6956 6990
6957 if (put_user(len, optlen)) 6991 if (put_user(len, optlen))
6958 return -EFAULT; 6992 return -EFAULT;
6959 if (copy_to_user(optval, &val, len)) 6993 if (copy_to_user(optval, &val, len))
6960 return -EFAULT; 6994 return -EFAULT;
6961 6995
6962 return 0; 6996 return 0;
6963 } 6997 }
6964 6998
6965 static int sctp_getsockopt_peer_auth_chunks(s 6999 static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
6966 char __us 7000 char __user *optval, int __user *optlen)
6967 { 7001 {
6968 struct sctp_authchunks __user *p = (v 7002 struct sctp_authchunks __user *p = (void __user *)optval;
6969 struct sctp_authchunks val; 7003 struct sctp_authchunks val;
6970 struct sctp_association *asoc; 7004 struct sctp_association *asoc;
6971 struct sctp_chunks_param *ch; 7005 struct sctp_chunks_param *ch;
6972 u32 num_chunks = 0; 7006 u32 num_chunks = 0;
6973 char __user *to; 7007 char __user *to;
6974 7008
6975 if (len < sizeof(struct sctp_authchun 7009 if (len < sizeof(struct sctp_authchunks))
6976 return -EINVAL; 7010 return -EINVAL;
6977 7011
6978 if (copy_from_user(&val, optval, size 7012 if (copy_from_user(&val, optval, sizeof(val)))
6979 return -EFAULT; 7013 return -EFAULT;
6980 7014
6981 to = p->gauth_chunks; 7015 to = p->gauth_chunks;
6982 asoc = sctp_id2assoc(sk, val.gauth_as 7016 asoc = sctp_id2assoc(sk, val.gauth_assoc_id);
6983 if (!asoc) 7017 if (!asoc)
6984 return -EINVAL; 7018 return -EINVAL;
6985 7019
6986 if (!asoc->peer.auth_capable) 7020 if (!asoc->peer.auth_capable)
6987 return -EACCES; 7021 return -EACCES;
6988 7022
6989 ch = asoc->peer.peer_chunks; 7023 ch = asoc->peer.peer_chunks;
6990 if (!ch) 7024 if (!ch)
6991 goto num; 7025 goto num;
6992 7026
6993 /* See if the user provided enough ro 7027 /* See if the user provided enough room for all the data */
6994 num_chunks = ntohs(ch->param_hdr.leng 7028 num_chunks = ntohs(ch->param_hdr.length) - sizeof(struct sctp_paramhdr);
6995 if (len < num_chunks) 7029 if (len < num_chunks)
6996 return -EINVAL; 7030 return -EINVAL;
6997 7031
6998 if (copy_to_user(to, ch->chunks, num_ 7032 if (copy_to_user(to, ch->chunks, num_chunks))
6999 return -EFAULT; 7033 return -EFAULT;
7000 num: 7034 num:
7001 len = sizeof(struct sctp_authchunks) 7035 len = sizeof(struct sctp_authchunks) + num_chunks;
7002 if (put_user(len, optlen)) 7036 if (put_user(len, optlen))
7003 return -EFAULT; 7037 return -EFAULT;
7004 if (put_user(num_chunks, &p->gauth_nu 7038 if (put_user(num_chunks, &p->gauth_number_of_chunks))
7005 return -EFAULT; 7039 return -EFAULT;
7006 return 0; 7040 return 0;
7007 } 7041 }
7008 7042
7009 static int sctp_getsockopt_local_auth_chunks( 7043 static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
7010 char __us 7044 char __user *optval, int __user *optlen)
7011 { 7045 {
7012 struct sctp_endpoint *ep = sctp_sk(sk 7046 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
7013 struct sctp_authchunks __user *p = (v 7047 struct sctp_authchunks __user *p = (void __user *)optval;
7014 struct sctp_authchunks val; 7048 struct sctp_authchunks val;
7015 struct sctp_association *asoc; 7049 struct sctp_association *asoc;
7016 struct sctp_chunks_param *ch; 7050 struct sctp_chunks_param *ch;
7017 u32 num_chunks = 0; 7051 u32 num_chunks = 0;
7018 char __user *to; 7052 char __user *to;
7019 7053
7020 if (len < sizeof(struct sctp_authchun 7054 if (len < sizeof(struct sctp_authchunks))
7021 return -EINVAL; 7055 return -EINVAL;
7022 7056
7023 if (copy_from_user(&val, optval, size 7057 if (copy_from_user(&val, optval, sizeof(val)))
7024 return -EFAULT; 7058 return -EFAULT;
7025 7059
7026 to = p->gauth_chunks; 7060 to = p->gauth_chunks;
7027 asoc = sctp_id2assoc(sk, val.gauth_as 7061 asoc = sctp_id2assoc(sk, val.gauth_assoc_id);
7028 if (!asoc && val.gauth_assoc_id != SC 7062 if (!asoc && val.gauth_assoc_id != SCTP_FUTURE_ASSOC &&
7029 sctp_style(sk, UDP)) 7063 sctp_style(sk, UDP))
7030 return -EINVAL; 7064 return -EINVAL;
7031 7065
7032 if (asoc) { 7066 if (asoc) {
7033 if (!asoc->peer.auth_capable) 7067 if (!asoc->peer.auth_capable)
7034 return -EACCES; 7068 return -EACCES;
7035 ch = (struct sctp_chunks_para 7069 ch = (struct sctp_chunks_param *)asoc->c.auth_chunks;
7036 } else { 7070 } else {
7037 if (!ep->auth_enable) 7071 if (!ep->auth_enable)
7038 return -EACCES; 7072 return -EACCES;
7039 ch = ep->auth_chunk_list; 7073 ch = ep->auth_chunk_list;
7040 } 7074 }
7041 if (!ch) 7075 if (!ch)
7042 goto num; 7076 goto num;
7043 7077
7044 num_chunks = ntohs(ch->param_hdr.leng 7078 num_chunks = ntohs(ch->param_hdr.length) - sizeof(struct sctp_paramhdr);
7045 if (len < sizeof(struct sctp_authchun 7079 if (len < sizeof(struct sctp_authchunks) + num_chunks)
7046 return -EINVAL; 7080 return -EINVAL;
7047 7081
7048 if (copy_to_user(to, ch->chunks, num_ 7082 if (copy_to_user(to, ch->chunks, num_chunks))
7049 return -EFAULT; 7083 return -EFAULT;
7050 num: 7084 num:
7051 len = sizeof(struct sctp_authchunks) 7085 len = sizeof(struct sctp_authchunks) + num_chunks;
7052 if (put_user(len, optlen)) 7086 if (put_user(len, optlen))
7053 return -EFAULT; 7087 return -EFAULT;
7054 if (put_user(num_chunks, &p->gauth_nu 7088 if (put_user(num_chunks, &p->gauth_number_of_chunks))
7055 return -EFAULT; 7089 return -EFAULT;
7056 7090
7057 return 0; 7091 return 0;
7058 } 7092 }
7059 7093
7060 /* 7094 /*
7061 * 8.2.5. Get the Current Number of Associat 7095 * 8.2.5. Get the Current Number of Associations (SCTP_GET_ASSOC_NUMBER)
7062 * This option gets the current number of ass 7096 * This option gets the current number of associations that are attached
7063 * to a one-to-many style socket. The option 7097 * to a one-to-many style socket. The option value is an uint32_t.
7064 */ 7098 */
7065 static int sctp_getsockopt_assoc_number(struc 7099 static int sctp_getsockopt_assoc_number(struct sock *sk, int len,
7066 char __us 7100 char __user *optval, int __user *optlen)
7067 { 7101 {
7068 struct sctp_sock *sp = sctp_sk(sk); 7102 struct sctp_sock *sp = sctp_sk(sk);
7069 struct sctp_association *asoc; 7103 struct sctp_association *asoc;
7070 u32 val = 0; 7104 u32 val = 0;
7071 7105
7072 if (sctp_style(sk, TCP)) 7106 if (sctp_style(sk, TCP))
7073 return -EOPNOTSUPP; 7107 return -EOPNOTSUPP;
7074 7108
7075 if (len < sizeof(u32)) 7109 if (len < sizeof(u32))
7076 return -EINVAL; 7110 return -EINVAL;
7077 7111
7078 len = sizeof(u32); 7112 len = sizeof(u32);
7079 7113
7080 list_for_each_entry(asoc, &(sp->ep->a 7114 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7081 val++; 7115 val++;
7082 } 7116 }
7083 7117
7084 if (put_user(len, optlen)) 7118 if (put_user(len, optlen))
7085 return -EFAULT; 7119 return -EFAULT;
7086 if (copy_to_user(optval, &val, len)) 7120 if (copy_to_user(optval, &val, len))
7087 return -EFAULT; 7121 return -EFAULT;
7088 7122
7089 return 0; 7123 return 0;
7090 } 7124 }
7091 7125
7092 /* 7126 /*
7093 * 8.1.23 SCTP_AUTO_ASCONF 7127 * 8.1.23 SCTP_AUTO_ASCONF
7094 * See the corresponding setsockopt entry as 7128 * See the corresponding setsockopt entry as description
7095 */ 7129 */
7096 static int sctp_getsockopt_auto_asconf(struct 7130 static int sctp_getsockopt_auto_asconf(struct sock *sk, int len,
7097 char __use 7131 char __user *optval, int __user *optlen)
7098 { 7132 {
7099 int val = 0; 7133 int val = 0;
7100 7134
7101 if (len < sizeof(int)) 7135 if (len < sizeof(int))
7102 return -EINVAL; 7136 return -EINVAL;
7103 7137
7104 len = sizeof(int); 7138 len = sizeof(int);
7105 if (sctp_sk(sk)->do_auto_asconf && sc 7139 if (sctp_sk(sk)->do_auto_asconf && sctp_is_ep_boundall(sk))
7106 val = 1; 7140 val = 1;
7107 if (put_user(len, optlen)) 7141 if (put_user(len, optlen))
7108 return -EFAULT; 7142 return -EFAULT;
7109 if (copy_to_user(optval, &val, len)) 7143 if (copy_to_user(optval, &val, len))
7110 return -EFAULT; 7144 return -EFAULT;
7111 return 0; 7145 return 0;
7112 } 7146 }
7113 7147
7114 /* 7148 /*
7115 * 8.2.6. Get the Current Identifiers of Asso 7149 * 8.2.6. Get the Current Identifiers of Associations
7116 * (SCTP_GET_ASSOC_ID_LIST) 7150 * (SCTP_GET_ASSOC_ID_LIST)
7117 * 7151 *
7118 * This option gets the current list of SCTP 7152 * This option gets the current list of SCTP association identifiers of
7119 * the SCTP associations handled by a one-to- 7153 * the SCTP associations handled by a one-to-many style socket.
7120 */ 7154 */
7121 static int sctp_getsockopt_assoc_ids(struct s 7155 static int sctp_getsockopt_assoc_ids(struct sock *sk, int len,
7122 char __us 7156 char __user *optval, int __user *optlen)
7123 { 7157 {
7124 struct sctp_sock *sp = sctp_sk(sk); 7158 struct sctp_sock *sp = sctp_sk(sk);
7125 struct sctp_association *asoc; 7159 struct sctp_association *asoc;
7126 struct sctp_assoc_ids *ids; 7160 struct sctp_assoc_ids *ids;
7127 size_t ids_size; 7161 size_t ids_size;
7128 u32 num = 0; 7162 u32 num = 0;
7129 7163
7130 if (sctp_style(sk, TCP)) 7164 if (sctp_style(sk, TCP))
7131 return -EOPNOTSUPP; 7165 return -EOPNOTSUPP;
7132 7166
7133 if (len < sizeof(struct sctp_assoc_id 7167 if (len < sizeof(struct sctp_assoc_ids))
7134 return -EINVAL; 7168 return -EINVAL;
7135 7169
7136 list_for_each_entry(asoc, &(sp->ep->a 7170 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7137 num++; 7171 num++;
7138 } 7172 }
7139 7173
7140 ids_size = struct_size(ids, gaids_ass 7174 ids_size = struct_size(ids, gaids_assoc_id, num);
7141 if (len < ids_size) 7175 if (len < ids_size)
7142 return -EINVAL; 7176 return -EINVAL;
7143 7177
7144 len = ids_size; 7178 len = ids_size;
7145 ids = kmalloc(len, GFP_USER | __GFP_N 7179 ids = kmalloc(len, GFP_USER | __GFP_NOWARN);
7146 if (unlikely(!ids)) 7180 if (unlikely(!ids))
7147 return -ENOMEM; 7181 return -ENOMEM;
7148 7182
7149 ids->gaids_number_of_ids = num; 7183 ids->gaids_number_of_ids = num;
7150 num = 0; 7184 num = 0;
7151 list_for_each_entry(asoc, &(sp->ep->a 7185 list_for_each_entry(asoc, &(sp->ep->asocs), asocs) {
7152 ids->gaids_assoc_id[num++] = 7186 ids->gaids_assoc_id[num++] = asoc->assoc_id;
7153 } 7187 }
7154 7188
7155 if (put_user(len, optlen) || copy_to_ 7189 if (put_user(len, optlen) || copy_to_user(optval, ids, len)) {
7156 kfree(ids); 7190 kfree(ids);
7157 return -EFAULT; 7191 return -EFAULT;
7158 } 7192 }
7159 7193
7160 kfree(ids); 7194 kfree(ids);
7161 return 0; 7195 return 0;
7162 } 7196 }
7163 7197
7164 /* 7198 /*
7165 * SCTP_PEER_ADDR_THLDS 7199 * SCTP_PEER_ADDR_THLDS
7166 * 7200 *
7167 * This option allows us to fetch the partial 7201 * This option allows us to fetch the partially failed threshold for one or all
7168 * transports in an association. See Section 7202 * transports in an association. See Section 6.1 of:
7169 * http://www.ietf.org/id/draft-nishida-tsvwg 7203 * http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
7170 */ 7204 */
7171 static int sctp_getsockopt_paddr_thresholds(s 7205 static int sctp_getsockopt_paddr_thresholds(struct sock *sk,
7172 c !! 7206 char __user *optval,
7173 i !! 7207 int len,
>> 7208 int __user *optlen)
7174 { 7209 {
7175 struct sctp_paddrthlds_v2 val; !! 7210 struct sctp_paddrthlds val;
7176 struct sctp_transport *trans; 7211 struct sctp_transport *trans;
7177 struct sctp_association *asoc; 7212 struct sctp_association *asoc;
7178 int min; <<
7179 7213
7180 min = v2 ? sizeof(val) : sizeof(struc !! 7214 if (len < sizeof(struct sctp_paddrthlds))
7181 if (len < min) <<
7182 return -EINVAL; 7215 return -EINVAL;
7183 len = min; !! 7216 len = sizeof(struct sctp_paddrthlds);
7184 if (copy_from_user(&val, optval, len) !! 7217 if (copy_from_user(&val, (struct sctp_paddrthlds __user *)optval, len))
7185 return -EFAULT; 7218 return -EFAULT;
7186 7219
7187 if (!sctp_is_any(sk, (const union sct 7220 if (!sctp_is_any(sk, (const union sctp_addr *)&val.spt_address)) {
7188 trans = sctp_addr_id2transpor 7221 trans = sctp_addr_id2transport(sk, &val.spt_address,
7189 7222 val.spt_assoc_id);
7190 if (!trans) 7223 if (!trans)
7191 return -ENOENT; 7224 return -ENOENT;
7192 7225
7193 val.spt_pathmaxrxt = trans->p 7226 val.spt_pathmaxrxt = trans->pathmaxrxt;
7194 val.spt_pathpfthld = trans->p 7227 val.spt_pathpfthld = trans->pf_retrans;
7195 val.spt_pathcpthld = trans->p <<
7196 7228
7197 goto out; 7229 goto out;
7198 } 7230 }
7199 7231
7200 asoc = sctp_id2assoc(sk, val.spt_asso 7232 asoc = sctp_id2assoc(sk, val.spt_assoc_id);
7201 if (!asoc && val.spt_assoc_id != SCTP 7233 if (!asoc && val.spt_assoc_id != SCTP_FUTURE_ASSOC &&
7202 sctp_style(sk, UDP)) 7234 sctp_style(sk, UDP))
7203 return -EINVAL; 7235 return -EINVAL;
7204 7236
7205 if (asoc) { 7237 if (asoc) {
7206 val.spt_pathpfthld = asoc->pf 7238 val.spt_pathpfthld = asoc->pf_retrans;
7207 val.spt_pathmaxrxt = asoc->pa 7239 val.spt_pathmaxrxt = asoc->pathmaxrxt;
7208 val.spt_pathcpthld = asoc->ps <<
7209 } else { 7240 } else {
7210 struct sctp_sock *sp = sctp_s 7241 struct sctp_sock *sp = sctp_sk(sk);
7211 7242
7212 val.spt_pathpfthld = sp->pf_r 7243 val.spt_pathpfthld = sp->pf_retrans;
7213 val.spt_pathmaxrxt = sp->path 7244 val.spt_pathmaxrxt = sp->pathmaxrxt;
7214 val.spt_pathcpthld = sp->ps_r <<
7215 } 7245 }
7216 7246
7217 out: 7247 out:
7218 if (put_user(len, optlen) || copy_to_ 7248 if (put_user(len, optlen) || copy_to_user(optval, &val, len))
7219 return -EFAULT; 7249 return -EFAULT;
7220 7250
7221 return 0; 7251 return 0;
7222 } 7252 }
7223 7253
7224 /* 7254 /*
7225 * SCTP_GET_ASSOC_STATS 7255 * SCTP_GET_ASSOC_STATS
7226 * 7256 *
7227 * This option retrieves local per endpoint s 7257 * This option retrieves local per endpoint statistics. It is modeled
7228 * after OpenSolaris' implementation 7258 * after OpenSolaris' implementation
7229 */ 7259 */
7230 static int sctp_getsockopt_assoc_stats(struct 7260 static int sctp_getsockopt_assoc_stats(struct sock *sk, int len,
7231 char _ 7261 char __user *optval,
7232 int __ 7262 int __user *optlen)
7233 { 7263 {
7234 struct sctp_assoc_stats sas; 7264 struct sctp_assoc_stats sas;
7235 struct sctp_association *asoc = NULL; 7265 struct sctp_association *asoc = NULL;
7236 7266
7237 /* User must provide at least the ass 7267 /* User must provide at least the assoc id */
7238 if (len < sizeof(sctp_assoc_t)) 7268 if (len < sizeof(sctp_assoc_t))
7239 return -EINVAL; 7269 return -EINVAL;
7240 7270
7241 /* Allow the struct to grow and fill 7271 /* Allow the struct to grow and fill in as much as possible */
7242 len = min_t(size_t, len, sizeof(sas)) 7272 len = min_t(size_t, len, sizeof(sas));
7243 7273
7244 if (copy_from_user(&sas, optval, len) 7274 if (copy_from_user(&sas, optval, len))
7245 return -EFAULT; 7275 return -EFAULT;
7246 7276
7247 asoc = sctp_id2assoc(sk, sas.sas_asso 7277 asoc = sctp_id2assoc(sk, sas.sas_assoc_id);
7248 if (!asoc) 7278 if (!asoc)
7249 return -EINVAL; 7279 return -EINVAL;
7250 7280
7251 sas.sas_rtxchunks = asoc->stats.rtxch 7281 sas.sas_rtxchunks = asoc->stats.rtxchunks;
7252 sas.sas_gapcnt = asoc->stats.gapcnt; 7282 sas.sas_gapcnt = asoc->stats.gapcnt;
7253 sas.sas_outofseqtsns = asoc->stats.ou 7283 sas.sas_outofseqtsns = asoc->stats.outofseqtsns;
7254 sas.sas_osacks = asoc->stats.osacks; 7284 sas.sas_osacks = asoc->stats.osacks;
7255 sas.sas_isacks = asoc->stats.isacks; 7285 sas.sas_isacks = asoc->stats.isacks;
7256 sas.sas_octrlchunks = asoc->stats.oct 7286 sas.sas_octrlchunks = asoc->stats.octrlchunks;
7257 sas.sas_ictrlchunks = asoc->stats.ict 7287 sas.sas_ictrlchunks = asoc->stats.ictrlchunks;
7258 sas.sas_oodchunks = asoc->stats.oodch 7288 sas.sas_oodchunks = asoc->stats.oodchunks;
7259 sas.sas_iodchunks = asoc->stats.iodch 7289 sas.sas_iodchunks = asoc->stats.iodchunks;
7260 sas.sas_ouodchunks = asoc->stats.ouod 7290 sas.sas_ouodchunks = asoc->stats.ouodchunks;
7261 sas.sas_iuodchunks = asoc->stats.iuod 7291 sas.sas_iuodchunks = asoc->stats.iuodchunks;
7262 sas.sas_idupchunks = asoc->stats.idup 7292 sas.sas_idupchunks = asoc->stats.idupchunks;
7263 sas.sas_opackets = asoc->stats.opacke 7293 sas.sas_opackets = asoc->stats.opackets;
7264 sas.sas_ipackets = asoc->stats.ipacke 7294 sas.sas_ipackets = asoc->stats.ipackets;
7265 7295
7266 /* New high max rto observed, will re 7296 /* New high max rto observed, will return 0 if not a single
7267 * RTO update took place. obs_rto_ipa 7297 * RTO update took place. obs_rto_ipaddr will be bogus
7268 * in such a case 7298 * in such a case
7269 */ 7299 */
7270 sas.sas_maxrto = asoc->stats.max_obs_ 7300 sas.sas_maxrto = asoc->stats.max_obs_rto;
7271 memcpy(&sas.sas_obs_rto_ipaddr, &asoc 7301 memcpy(&sas.sas_obs_rto_ipaddr, &asoc->stats.obs_rto_ipaddr,
7272 sizeof(struct sockaddr_storag 7302 sizeof(struct sockaddr_storage));
7273 7303
7274 /* Mark beginning of a new observatio 7304 /* Mark beginning of a new observation period */
7275 asoc->stats.max_obs_rto = asoc->rto_m 7305 asoc->stats.max_obs_rto = asoc->rto_min;
7276 7306
7277 if (put_user(len, optlen)) 7307 if (put_user(len, optlen))
7278 return -EFAULT; 7308 return -EFAULT;
7279 7309
7280 pr_debug("%s: len:%d, assoc_id:%d\n", 7310 pr_debug("%s: len:%d, assoc_id:%d\n", __func__, len, sas.sas_assoc_id);
7281 7311
7282 if (copy_to_user(optval, &sas, len)) 7312 if (copy_to_user(optval, &sas, len))
7283 return -EFAULT; 7313 return -EFAULT;
7284 7314
7285 return 0; 7315 return 0;
7286 } 7316 }
7287 7317
7288 static int sctp_getsockopt_recvrcvinfo(struct 7318 static int sctp_getsockopt_recvrcvinfo(struct sock *sk, int len,
7289 char _ 7319 char __user *optval,
7290 int __ 7320 int __user *optlen)
7291 { 7321 {
7292 int val = 0; 7322 int val = 0;
7293 7323
7294 if (len < sizeof(int)) 7324 if (len < sizeof(int))
7295 return -EINVAL; 7325 return -EINVAL;
7296 7326
7297 len = sizeof(int); 7327 len = sizeof(int);
7298 if (sctp_sk(sk)->recvrcvinfo) 7328 if (sctp_sk(sk)->recvrcvinfo)
7299 val = 1; 7329 val = 1;
7300 if (put_user(len, optlen)) 7330 if (put_user(len, optlen))
7301 return -EFAULT; 7331 return -EFAULT;
7302 if (copy_to_user(optval, &val, len)) 7332 if (copy_to_user(optval, &val, len))
7303 return -EFAULT; 7333 return -EFAULT;
7304 7334
7305 return 0; 7335 return 0;
7306 } 7336 }
7307 7337
7308 static int sctp_getsockopt_recvnxtinfo(struct 7338 static int sctp_getsockopt_recvnxtinfo(struct sock *sk, int len,
7309 char _ 7339 char __user *optval,
7310 int __ 7340 int __user *optlen)
7311 { 7341 {
7312 int val = 0; 7342 int val = 0;
7313 7343
7314 if (len < sizeof(int)) 7344 if (len < sizeof(int))
7315 return -EINVAL; 7345 return -EINVAL;
7316 7346
7317 len = sizeof(int); 7347 len = sizeof(int);
7318 if (sctp_sk(sk)->recvnxtinfo) 7348 if (sctp_sk(sk)->recvnxtinfo)
7319 val = 1; 7349 val = 1;
7320 if (put_user(len, optlen)) 7350 if (put_user(len, optlen))
7321 return -EFAULT; 7351 return -EFAULT;
7322 if (copy_to_user(optval, &val, len)) 7352 if (copy_to_user(optval, &val, len))
7323 return -EFAULT; 7353 return -EFAULT;
7324 7354
7325 return 0; 7355 return 0;
7326 } 7356 }
7327 7357
7328 static int sctp_getsockopt_pr_supported(struc 7358 static int sctp_getsockopt_pr_supported(struct sock *sk, int len,
7329 char 7359 char __user *optval,
7330 int _ 7360 int __user *optlen)
7331 { 7361 {
7332 struct sctp_assoc_value params; 7362 struct sctp_assoc_value params;
7333 struct sctp_association *asoc; 7363 struct sctp_association *asoc;
7334 int retval = -EFAULT; 7364 int retval = -EFAULT;
7335 7365
7336 if (len < sizeof(params)) { 7366 if (len < sizeof(params)) {
7337 retval = -EINVAL; 7367 retval = -EINVAL;
7338 goto out; 7368 goto out;
7339 } 7369 }
7340 7370
7341 len = sizeof(params); 7371 len = sizeof(params);
7342 if (copy_from_user(¶ms, optval, l 7372 if (copy_from_user(¶ms, optval, len))
7343 goto out; 7373 goto out;
7344 7374
7345 asoc = sctp_id2assoc(sk, params.assoc 7375 asoc = sctp_id2assoc(sk, params.assoc_id);
7346 if (!asoc && params.assoc_id != SCTP_ 7376 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7347 sctp_style(sk, UDP)) { 7377 sctp_style(sk, UDP)) {
7348 retval = -EINVAL; 7378 retval = -EINVAL;
7349 goto out; 7379 goto out;
7350 } 7380 }
7351 7381
7352 params.assoc_value = asoc ? asoc->pee 7382 params.assoc_value = asoc ? asoc->peer.prsctp_capable
7353 : sctp_sk(s 7383 : sctp_sk(sk)->ep->prsctp_enable;
7354 7384
7355 if (put_user(len, optlen)) 7385 if (put_user(len, optlen))
7356 goto out; 7386 goto out;
7357 7387
7358 if (copy_to_user(optval, ¶ms, len 7388 if (copy_to_user(optval, ¶ms, len))
7359 goto out; 7389 goto out;
7360 7390
7361 retval = 0; 7391 retval = 0;
7362 7392
7363 out: 7393 out:
7364 return retval; 7394 return retval;
7365 } 7395 }
7366 7396
7367 static int sctp_getsockopt_default_prinfo(str 7397 static int sctp_getsockopt_default_prinfo(struct sock *sk, int len,
7368 cha 7398 char __user *optval,
7369 int 7399 int __user *optlen)
7370 { 7400 {
7371 struct sctp_default_prinfo info; 7401 struct sctp_default_prinfo info;
7372 struct sctp_association *asoc; 7402 struct sctp_association *asoc;
7373 int retval = -EFAULT; 7403 int retval = -EFAULT;
7374 7404
7375 if (len < sizeof(info)) { 7405 if (len < sizeof(info)) {
7376 retval = -EINVAL; 7406 retval = -EINVAL;
7377 goto out; 7407 goto out;
7378 } 7408 }
7379 7409
7380 len = sizeof(info); 7410 len = sizeof(info);
7381 if (copy_from_user(&info, optval, len 7411 if (copy_from_user(&info, optval, len))
7382 goto out; 7412 goto out;
7383 7413
7384 asoc = sctp_id2assoc(sk, info.pr_asso 7414 asoc = sctp_id2assoc(sk, info.pr_assoc_id);
7385 if (!asoc && info.pr_assoc_id != SCTP 7415 if (!asoc && info.pr_assoc_id != SCTP_FUTURE_ASSOC &&
7386 sctp_style(sk, UDP)) { 7416 sctp_style(sk, UDP)) {
7387 retval = -EINVAL; 7417 retval = -EINVAL;
7388 goto out; 7418 goto out;
7389 } 7419 }
7390 7420
7391 if (asoc) { 7421 if (asoc) {
7392 info.pr_policy = SCTP_PR_POLI 7422 info.pr_policy = SCTP_PR_POLICY(asoc->default_flags);
7393 info.pr_value = asoc->default 7423 info.pr_value = asoc->default_timetolive;
7394 } else { 7424 } else {
7395 struct sctp_sock *sp = sctp_s 7425 struct sctp_sock *sp = sctp_sk(sk);
7396 7426
7397 info.pr_policy = SCTP_PR_POLI 7427 info.pr_policy = SCTP_PR_POLICY(sp->default_flags);
7398 info.pr_value = sp->default_t 7428 info.pr_value = sp->default_timetolive;
7399 } 7429 }
7400 7430
7401 if (put_user(len, optlen)) 7431 if (put_user(len, optlen))
7402 goto out; 7432 goto out;
7403 7433
7404 if (copy_to_user(optval, &info, len)) 7434 if (copy_to_user(optval, &info, len))
7405 goto out; 7435 goto out;
7406 7436
7407 retval = 0; 7437 retval = 0;
7408 7438
7409 out: 7439 out:
7410 return retval; 7440 return retval;
7411 } 7441 }
7412 7442
7413 static int sctp_getsockopt_pr_assocstatus(str 7443 static int sctp_getsockopt_pr_assocstatus(struct sock *sk, int len,
7414 cha 7444 char __user *optval,
7415 int 7445 int __user *optlen)
7416 { 7446 {
7417 struct sctp_prstatus params; 7447 struct sctp_prstatus params;
7418 struct sctp_association *asoc; 7448 struct sctp_association *asoc;
7419 int policy; 7449 int policy;
7420 int retval = -EINVAL; 7450 int retval = -EINVAL;
7421 7451
7422 if (len < sizeof(params)) 7452 if (len < sizeof(params))
7423 goto out; 7453 goto out;
7424 7454
7425 len = sizeof(params); 7455 len = sizeof(params);
7426 if (copy_from_user(¶ms, optval, l 7456 if (copy_from_user(¶ms, optval, len)) {
7427 retval = -EFAULT; 7457 retval = -EFAULT;
7428 goto out; 7458 goto out;
7429 } 7459 }
7430 7460
7431 policy = params.sprstat_policy; 7461 policy = params.sprstat_policy;
7432 if (!policy || (policy & ~(SCTP_PR_SC 7462 if (!policy || (policy & ~(SCTP_PR_SCTP_MASK | SCTP_PR_SCTP_ALL)) ||
7433 ((policy & SCTP_PR_SCTP_ALL) && ( 7463 ((policy & SCTP_PR_SCTP_ALL) && (policy & SCTP_PR_SCTP_MASK)))
7434 goto out; 7464 goto out;
7435 7465
7436 asoc = sctp_id2assoc(sk, params.sprst 7466 asoc = sctp_id2assoc(sk, params.sprstat_assoc_id);
7437 if (!asoc) 7467 if (!asoc)
7438 goto out; 7468 goto out;
7439 7469
7440 if (policy == SCTP_PR_SCTP_ALL) { 7470 if (policy == SCTP_PR_SCTP_ALL) {
7441 params.sprstat_abandoned_unse 7471 params.sprstat_abandoned_unsent = 0;
7442 params.sprstat_abandoned_sent 7472 params.sprstat_abandoned_sent = 0;
7443 for (policy = 0; policy <= SC 7473 for (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) {
7444 params.sprstat_abando 7474 params.sprstat_abandoned_unsent +=
7445 asoc->abandon 7475 asoc->abandoned_unsent[policy];
7446 params.sprstat_abando 7476 params.sprstat_abandoned_sent +=
7447 asoc->abandon 7477 asoc->abandoned_sent[policy];
7448 } 7478 }
7449 } else { 7479 } else {
7450 params.sprstat_abandoned_unse 7480 params.sprstat_abandoned_unsent =
7451 asoc->abandoned_unsen 7481 asoc->abandoned_unsent[__SCTP_PR_INDEX(policy)];
7452 params.sprstat_abandoned_sent 7482 params.sprstat_abandoned_sent =
7453 asoc->abandoned_sent[ 7483 asoc->abandoned_sent[__SCTP_PR_INDEX(policy)];
7454 } 7484 }
7455 7485
7456 if (put_user(len, optlen)) { 7486 if (put_user(len, optlen)) {
7457 retval = -EFAULT; 7487 retval = -EFAULT;
7458 goto out; 7488 goto out;
7459 } 7489 }
7460 7490
7461 if (copy_to_user(optval, ¶ms, len 7491 if (copy_to_user(optval, ¶ms, len)) {
7462 retval = -EFAULT; 7492 retval = -EFAULT;
7463 goto out; 7493 goto out;
7464 } 7494 }
7465 7495
7466 retval = 0; 7496 retval = 0;
7467 7497
7468 out: 7498 out:
7469 return retval; 7499 return retval;
7470 } 7500 }
7471 7501
7472 static int sctp_getsockopt_pr_streamstatus(st 7502 static int sctp_getsockopt_pr_streamstatus(struct sock *sk, int len,
7473 ch 7503 char __user *optval,
7474 in 7504 int __user *optlen)
7475 { 7505 {
7476 struct sctp_stream_out_ext *streamout 7506 struct sctp_stream_out_ext *streamoute;
7477 struct sctp_association *asoc; 7507 struct sctp_association *asoc;
7478 struct sctp_prstatus params; 7508 struct sctp_prstatus params;
7479 int retval = -EINVAL; 7509 int retval = -EINVAL;
7480 int policy; 7510 int policy;
7481 7511
7482 if (len < sizeof(params)) 7512 if (len < sizeof(params))
7483 goto out; 7513 goto out;
7484 7514
7485 len = sizeof(params); 7515 len = sizeof(params);
7486 if (copy_from_user(¶ms, optval, l 7516 if (copy_from_user(¶ms, optval, len)) {
7487 retval = -EFAULT; 7517 retval = -EFAULT;
7488 goto out; 7518 goto out;
7489 } 7519 }
7490 7520
7491 policy = params.sprstat_policy; 7521 policy = params.sprstat_policy;
7492 if (!policy || (policy & ~(SCTP_PR_SC 7522 if (!policy || (policy & ~(SCTP_PR_SCTP_MASK | SCTP_PR_SCTP_ALL)) ||
7493 ((policy & SCTP_PR_SCTP_ALL) && ( 7523 ((policy & SCTP_PR_SCTP_ALL) && (policy & SCTP_PR_SCTP_MASK)))
7494 goto out; 7524 goto out;
7495 7525
7496 asoc = sctp_id2assoc(sk, params.sprst 7526 asoc = sctp_id2assoc(sk, params.sprstat_assoc_id);
7497 if (!asoc || params.sprstat_sid >= as 7527 if (!asoc || params.sprstat_sid >= asoc->stream.outcnt)
7498 goto out; 7528 goto out;
7499 7529
7500 streamoute = SCTP_SO(&asoc->stream, p 7530 streamoute = SCTP_SO(&asoc->stream, params.sprstat_sid)->ext;
7501 if (!streamoute) { 7531 if (!streamoute) {
7502 /* Not allocated yet, means a 7532 /* Not allocated yet, means all stats are 0 */
7503 params.sprstat_abandoned_unse 7533 params.sprstat_abandoned_unsent = 0;
7504 params.sprstat_abandoned_sent 7534 params.sprstat_abandoned_sent = 0;
7505 retval = 0; 7535 retval = 0;
7506 goto out; 7536 goto out;
7507 } 7537 }
7508 7538
7509 if (policy == SCTP_PR_SCTP_ALL) { 7539 if (policy == SCTP_PR_SCTP_ALL) {
7510 params.sprstat_abandoned_unse 7540 params.sprstat_abandoned_unsent = 0;
7511 params.sprstat_abandoned_sent 7541 params.sprstat_abandoned_sent = 0;
7512 for (policy = 0; policy <= SC 7542 for (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) {
7513 params.sprstat_abando 7543 params.sprstat_abandoned_unsent +=
7514 streamoute->a 7544 streamoute->abandoned_unsent[policy];
7515 params.sprstat_abando 7545 params.sprstat_abandoned_sent +=
7516 streamoute->a 7546 streamoute->abandoned_sent[policy];
7517 } 7547 }
7518 } else { 7548 } else {
7519 params.sprstat_abandoned_unse 7549 params.sprstat_abandoned_unsent =
7520 streamoute->abandoned 7550 streamoute->abandoned_unsent[__SCTP_PR_INDEX(policy)];
7521 params.sprstat_abandoned_sent 7551 params.sprstat_abandoned_sent =
7522 streamoute->abandoned 7552 streamoute->abandoned_sent[__SCTP_PR_INDEX(policy)];
7523 } 7553 }
7524 7554
7525 if (put_user(len, optlen) || copy_to_ 7555 if (put_user(len, optlen) || copy_to_user(optval, ¶ms, len)) {
7526 retval = -EFAULT; 7556 retval = -EFAULT;
7527 goto out; 7557 goto out;
7528 } 7558 }
7529 7559
7530 retval = 0; 7560 retval = 0;
7531 7561
7532 out: 7562 out:
7533 return retval; 7563 return retval;
7534 } 7564 }
7535 7565
7536 static int sctp_getsockopt_reconfig_supported 7566 static int sctp_getsockopt_reconfig_supported(struct sock *sk, int len,
7537 7567 char __user *optval,
7538 7568 int __user *optlen)
7539 { 7569 {
7540 struct sctp_assoc_value params; 7570 struct sctp_assoc_value params;
7541 struct sctp_association *asoc; 7571 struct sctp_association *asoc;
7542 int retval = -EFAULT; 7572 int retval = -EFAULT;
7543 7573
7544 if (len < sizeof(params)) { 7574 if (len < sizeof(params)) {
7545 retval = -EINVAL; 7575 retval = -EINVAL;
7546 goto out; 7576 goto out;
7547 } 7577 }
7548 7578
7549 len = sizeof(params); 7579 len = sizeof(params);
7550 if (copy_from_user(¶ms, optval, l 7580 if (copy_from_user(¶ms, optval, len))
7551 goto out; 7581 goto out;
7552 7582
7553 asoc = sctp_id2assoc(sk, params.assoc 7583 asoc = sctp_id2assoc(sk, params.assoc_id);
7554 if (!asoc && params.assoc_id != SCTP_ 7584 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7555 sctp_style(sk, UDP)) { 7585 sctp_style(sk, UDP)) {
7556 retval = -EINVAL; 7586 retval = -EINVAL;
7557 goto out; 7587 goto out;
7558 } 7588 }
7559 7589
7560 params.assoc_value = asoc ? asoc->pee 7590 params.assoc_value = asoc ? asoc->peer.reconf_capable
7561 : sctp_sk(s 7591 : sctp_sk(sk)->ep->reconf_enable;
7562 7592
7563 if (put_user(len, optlen)) 7593 if (put_user(len, optlen))
7564 goto out; 7594 goto out;
7565 7595
7566 if (copy_to_user(optval, ¶ms, len 7596 if (copy_to_user(optval, ¶ms, len))
7567 goto out; 7597 goto out;
7568 7598
7569 retval = 0; 7599 retval = 0;
7570 7600
7571 out: 7601 out:
7572 return retval; 7602 return retval;
7573 } 7603 }
7574 7604
7575 static int sctp_getsockopt_enable_strreset(st 7605 static int sctp_getsockopt_enable_strreset(struct sock *sk, int len,
7576 ch 7606 char __user *optval,
7577 in 7607 int __user *optlen)
7578 { 7608 {
7579 struct sctp_assoc_value params; 7609 struct sctp_assoc_value params;
7580 struct sctp_association *asoc; 7610 struct sctp_association *asoc;
7581 int retval = -EFAULT; 7611 int retval = -EFAULT;
7582 7612
7583 if (len < sizeof(params)) { 7613 if (len < sizeof(params)) {
7584 retval = -EINVAL; 7614 retval = -EINVAL;
7585 goto out; 7615 goto out;
7586 } 7616 }
7587 7617
7588 len = sizeof(params); 7618 len = sizeof(params);
7589 if (copy_from_user(¶ms, optval, l 7619 if (copy_from_user(¶ms, optval, len))
7590 goto out; 7620 goto out;
7591 7621
7592 asoc = sctp_id2assoc(sk, params.assoc 7622 asoc = sctp_id2assoc(sk, params.assoc_id);
7593 if (!asoc && params.assoc_id != SCTP_ 7623 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7594 sctp_style(sk, UDP)) { 7624 sctp_style(sk, UDP)) {
7595 retval = -EINVAL; 7625 retval = -EINVAL;
7596 goto out; 7626 goto out;
7597 } 7627 }
7598 7628
7599 params.assoc_value = asoc ? asoc->str 7629 params.assoc_value = asoc ? asoc->strreset_enable
7600 : sctp_sk(s 7630 : sctp_sk(sk)->ep->strreset_enable;
7601 7631
7602 if (put_user(len, optlen)) 7632 if (put_user(len, optlen))
7603 goto out; 7633 goto out;
7604 7634
7605 if (copy_to_user(optval, ¶ms, len 7635 if (copy_to_user(optval, ¶ms, len))
7606 goto out; 7636 goto out;
7607 7637
7608 retval = 0; 7638 retval = 0;
7609 7639
7610 out: 7640 out:
7611 return retval; 7641 return retval;
7612 } 7642 }
7613 7643
7614 static int sctp_getsockopt_scheduler(struct s 7644 static int sctp_getsockopt_scheduler(struct sock *sk, int len,
7615 char __u 7645 char __user *optval,
7616 int __us 7646 int __user *optlen)
7617 { 7647 {
7618 struct sctp_assoc_value params; 7648 struct sctp_assoc_value params;
7619 struct sctp_association *asoc; 7649 struct sctp_association *asoc;
7620 int retval = -EFAULT; 7650 int retval = -EFAULT;
7621 7651
7622 if (len < sizeof(params)) { 7652 if (len < sizeof(params)) {
7623 retval = -EINVAL; 7653 retval = -EINVAL;
7624 goto out; 7654 goto out;
7625 } 7655 }
7626 7656
7627 len = sizeof(params); 7657 len = sizeof(params);
7628 if (copy_from_user(¶ms, optval, l 7658 if (copy_from_user(¶ms, optval, len))
7629 goto out; 7659 goto out;
7630 7660
7631 asoc = sctp_id2assoc(sk, params.assoc 7661 asoc = sctp_id2assoc(sk, params.assoc_id);
7632 if (!asoc && params.assoc_id != SCTP_ 7662 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7633 sctp_style(sk, UDP)) { 7663 sctp_style(sk, UDP)) {
7634 retval = -EINVAL; 7664 retval = -EINVAL;
7635 goto out; 7665 goto out;
7636 } 7666 }
7637 7667
7638 params.assoc_value = asoc ? sctp_sche 7668 params.assoc_value = asoc ? sctp_sched_get_sched(asoc)
7639 : sctp_sk(s 7669 : sctp_sk(sk)->default_ss;
7640 7670
7641 if (put_user(len, optlen)) 7671 if (put_user(len, optlen))
7642 goto out; 7672 goto out;
7643 7673
7644 if (copy_to_user(optval, ¶ms, len 7674 if (copy_to_user(optval, ¶ms, len))
7645 goto out; 7675 goto out;
7646 7676
7647 retval = 0; 7677 retval = 0;
7648 7678
7649 out: 7679 out:
7650 return retval; 7680 return retval;
7651 } 7681 }
7652 7682
7653 static int sctp_getsockopt_scheduler_value(st 7683 static int sctp_getsockopt_scheduler_value(struct sock *sk, int len,
7654 ch 7684 char __user *optval,
7655 in 7685 int __user *optlen)
7656 { 7686 {
7657 struct sctp_stream_value params; 7687 struct sctp_stream_value params;
7658 struct sctp_association *asoc; 7688 struct sctp_association *asoc;
7659 int retval = -EFAULT; 7689 int retval = -EFAULT;
7660 7690
7661 if (len < sizeof(params)) { 7691 if (len < sizeof(params)) {
7662 retval = -EINVAL; 7692 retval = -EINVAL;
7663 goto out; 7693 goto out;
7664 } 7694 }
7665 7695
7666 len = sizeof(params); 7696 len = sizeof(params);
7667 if (copy_from_user(¶ms, optval, l 7697 if (copy_from_user(¶ms, optval, len))
7668 goto out; 7698 goto out;
7669 7699
7670 asoc = sctp_id2assoc(sk, params.assoc 7700 asoc = sctp_id2assoc(sk, params.assoc_id);
7671 if (!asoc) { 7701 if (!asoc) {
7672 retval = -EINVAL; 7702 retval = -EINVAL;
7673 goto out; 7703 goto out;
7674 } 7704 }
7675 7705
7676 retval = sctp_sched_get_value(asoc, p 7706 retval = sctp_sched_get_value(asoc, params.stream_id,
7677 ¶ms 7707 ¶ms.stream_value);
7678 if (retval) 7708 if (retval)
7679 goto out; 7709 goto out;
7680 7710
7681 if (put_user(len, optlen)) { 7711 if (put_user(len, optlen)) {
7682 retval = -EFAULT; 7712 retval = -EFAULT;
7683 goto out; 7713 goto out;
7684 } 7714 }
7685 7715
7686 if (copy_to_user(optval, ¶ms, len 7716 if (copy_to_user(optval, ¶ms, len)) {
7687 retval = -EFAULT; 7717 retval = -EFAULT;
7688 goto out; 7718 goto out;
7689 } 7719 }
7690 7720
7691 out: 7721 out:
7692 return retval; 7722 return retval;
7693 } 7723 }
7694 7724
7695 static int sctp_getsockopt_interleaving_suppo 7725 static int sctp_getsockopt_interleaving_supported(struct sock *sk, int len,
7696 7726 char __user *optval,
7697 7727 int __user *optlen)
7698 { 7728 {
7699 struct sctp_assoc_value params; 7729 struct sctp_assoc_value params;
7700 struct sctp_association *asoc; 7730 struct sctp_association *asoc;
7701 int retval = -EFAULT; 7731 int retval = -EFAULT;
7702 7732
7703 if (len < sizeof(params)) { 7733 if (len < sizeof(params)) {
7704 retval = -EINVAL; 7734 retval = -EINVAL;
7705 goto out; 7735 goto out;
7706 } 7736 }
7707 7737
7708 len = sizeof(params); 7738 len = sizeof(params);
7709 if (copy_from_user(¶ms, optval, l 7739 if (copy_from_user(¶ms, optval, len))
7710 goto out; 7740 goto out;
7711 7741
7712 asoc = sctp_id2assoc(sk, params.assoc 7742 asoc = sctp_id2assoc(sk, params.assoc_id);
7713 if (!asoc && params.assoc_id != SCTP_ 7743 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7714 sctp_style(sk, UDP)) { 7744 sctp_style(sk, UDP)) {
7715 retval = -EINVAL; 7745 retval = -EINVAL;
7716 goto out; 7746 goto out;
7717 } 7747 }
7718 7748
7719 params.assoc_value = asoc ? asoc->pee 7749 params.assoc_value = asoc ? asoc->peer.intl_capable
7720 : sctp_sk(s 7750 : sctp_sk(sk)->ep->intl_enable;
7721 7751
7722 if (put_user(len, optlen)) 7752 if (put_user(len, optlen))
7723 goto out; 7753 goto out;
7724 7754
7725 if (copy_to_user(optval, ¶ms, len 7755 if (copy_to_user(optval, ¶ms, len))
7726 goto out; 7756 goto out;
7727 7757
7728 retval = 0; 7758 retval = 0;
7729 7759
7730 out: 7760 out:
7731 return retval; 7761 return retval;
7732 } 7762 }
7733 7763
7734 static int sctp_getsockopt_reuse_port(struct 7764 static int sctp_getsockopt_reuse_port(struct sock *sk, int len,
7735 char __ 7765 char __user *optval,
7736 int __u 7766 int __user *optlen)
7737 { 7767 {
7738 int val; 7768 int val;
7739 7769
7740 if (len < sizeof(int)) 7770 if (len < sizeof(int))
7741 return -EINVAL; 7771 return -EINVAL;
7742 7772
7743 len = sizeof(int); 7773 len = sizeof(int);
7744 val = sctp_sk(sk)->reuse; 7774 val = sctp_sk(sk)->reuse;
7745 if (put_user(len, optlen)) 7775 if (put_user(len, optlen))
7746 return -EFAULT; 7776 return -EFAULT;
7747 7777
7748 if (copy_to_user(optval, &val, len)) 7778 if (copy_to_user(optval, &val, len))
7749 return -EFAULT; 7779 return -EFAULT;
7750 7780
7751 return 0; 7781 return 0;
7752 } 7782 }
7753 7783
7754 static int sctp_getsockopt_event(struct sock 7784 static int sctp_getsockopt_event(struct sock *sk, int len, char __user *optval,
7755 int __user * 7785 int __user *optlen)
7756 { 7786 {
7757 struct sctp_association *asoc; 7787 struct sctp_association *asoc;
7758 struct sctp_event param; 7788 struct sctp_event param;
7759 __u16 subscribe; 7789 __u16 subscribe;
7760 7790
7761 if (len < sizeof(param)) 7791 if (len < sizeof(param))
7762 return -EINVAL; 7792 return -EINVAL;
7763 7793
7764 len = sizeof(param); 7794 len = sizeof(param);
7765 if (copy_from_user(¶m, optval, le 7795 if (copy_from_user(¶m, optval, len))
7766 return -EFAULT; 7796 return -EFAULT;
7767 7797
7768 if (param.se_type < SCTP_SN_TYPE_BASE 7798 if (param.se_type < SCTP_SN_TYPE_BASE ||
7769 param.se_type > SCTP_SN_TYPE_MAX) 7799 param.se_type > SCTP_SN_TYPE_MAX)
7770 return -EINVAL; 7800 return -EINVAL;
7771 7801
7772 asoc = sctp_id2assoc(sk, param.se_ass 7802 asoc = sctp_id2assoc(sk, param.se_assoc_id);
7773 if (!asoc && param.se_assoc_id != SCT 7803 if (!asoc && param.se_assoc_id != SCTP_FUTURE_ASSOC &&
7774 sctp_style(sk, UDP)) 7804 sctp_style(sk, UDP))
7775 return -EINVAL; 7805 return -EINVAL;
7776 7806
7777 subscribe = asoc ? asoc->subscribe : 7807 subscribe = asoc ? asoc->subscribe : sctp_sk(sk)->subscribe;
7778 param.se_on = sctp_ulpevent_type_enab 7808 param.se_on = sctp_ulpevent_type_enabled(subscribe, param.se_type);
7779 7809
7780 if (put_user(len, optlen)) 7810 if (put_user(len, optlen))
7781 return -EFAULT; 7811 return -EFAULT;
7782 7812
7783 if (copy_to_user(optval, ¶m, len) 7813 if (copy_to_user(optval, ¶m, len))
7784 return -EFAULT; 7814 return -EFAULT;
7785 7815
7786 return 0; 7816 return 0;
7787 } 7817 }
7788 7818
7789 static int sctp_getsockopt_asconf_supported(s 7819 static int sctp_getsockopt_asconf_supported(struct sock *sk, int len,
7790 c 7820 char __user *optval,
7791 i 7821 int __user *optlen)
7792 { 7822 {
7793 struct sctp_assoc_value params; 7823 struct sctp_assoc_value params;
7794 struct sctp_association *asoc; 7824 struct sctp_association *asoc;
7795 int retval = -EFAULT; 7825 int retval = -EFAULT;
7796 7826
7797 if (len < sizeof(params)) { 7827 if (len < sizeof(params)) {
7798 retval = -EINVAL; 7828 retval = -EINVAL;
7799 goto out; 7829 goto out;
7800 } 7830 }
7801 7831
7802 len = sizeof(params); 7832 len = sizeof(params);
7803 if (copy_from_user(¶ms, optval, l 7833 if (copy_from_user(¶ms, optval, len))
7804 goto out; 7834 goto out;
7805 7835
7806 asoc = sctp_id2assoc(sk, params.assoc 7836 asoc = sctp_id2assoc(sk, params.assoc_id);
7807 if (!asoc && params.assoc_id != SCTP_ 7837 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7808 sctp_style(sk, UDP)) { 7838 sctp_style(sk, UDP)) {
7809 retval = -EINVAL; 7839 retval = -EINVAL;
7810 goto out; 7840 goto out;
7811 } 7841 }
7812 7842
7813 params.assoc_value = asoc ? asoc->pee 7843 params.assoc_value = asoc ? asoc->peer.asconf_capable
7814 : sctp_sk(s 7844 : sctp_sk(sk)->ep->asconf_enable;
7815 7845
7816 if (put_user(len, optlen)) 7846 if (put_user(len, optlen))
7817 goto out; 7847 goto out;
7818 7848
7819 if (copy_to_user(optval, ¶ms, len 7849 if (copy_to_user(optval, ¶ms, len))
7820 goto out; 7850 goto out;
7821 7851
7822 retval = 0; 7852 retval = 0;
7823 7853
7824 out: 7854 out:
7825 return retval; 7855 return retval;
7826 } 7856 }
7827 7857
7828 static int sctp_getsockopt_auth_supported(str 7858 static int sctp_getsockopt_auth_supported(struct sock *sk, int len,
7829 cha 7859 char __user *optval,
7830 int 7860 int __user *optlen)
7831 { 7861 {
7832 struct sctp_assoc_value params; 7862 struct sctp_assoc_value params;
7833 struct sctp_association *asoc; 7863 struct sctp_association *asoc;
7834 int retval = -EFAULT; 7864 int retval = -EFAULT;
7835 7865
7836 if (len < sizeof(params)) { 7866 if (len < sizeof(params)) {
7837 retval = -EINVAL; 7867 retval = -EINVAL;
7838 goto out; 7868 goto out;
7839 } 7869 }
7840 7870
7841 len = sizeof(params); 7871 len = sizeof(params);
7842 if (copy_from_user(¶ms, optval, l 7872 if (copy_from_user(¶ms, optval, len))
7843 goto out; 7873 goto out;
7844 7874
7845 asoc = sctp_id2assoc(sk, params.assoc 7875 asoc = sctp_id2assoc(sk, params.assoc_id);
7846 if (!asoc && params.assoc_id != SCTP_ 7876 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7847 sctp_style(sk, UDP)) { 7877 sctp_style(sk, UDP)) {
7848 retval = -EINVAL; 7878 retval = -EINVAL;
7849 goto out; 7879 goto out;
7850 } 7880 }
7851 7881
7852 params.assoc_value = asoc ? asoc->pee 7882 params.assoc_value = asoc ? asoc->peer.auth_capable
7853 : sctp_sk(s 7883 : sctp_sk(sk)->ep->auth_enable;
7854 7884
7855 if (put_user(len, optlen)) 7885 if (put_user(len, optlen))
7856 goto out; 7886 goto out;
7857 7887
7858 if (copy_to_user(optval, ¶ms, len 7888 if (copy_to_user(optval, ¶ms, len))
7859 goto out; 7889 goto out;
7860 7890
7861 retval = 0; 7891 retval = 0;
7862 7892
7863 out: 7893 out:
7864 return retval; 7894 return retval;
7865 } 7895 }
7866 7896
7867 static int sctp_getsockopt_ecn_supported(stru 7897 static int sctp_getsockopt_ecn_supported(struct sock *sk, int len,
7868 char 7898 char __user *optval,
7869 int 7899 int __user *optlen)
7870 { 7900 {
7871 struct sctp_assoc_value params; 7901 struct sctp_assoc_value params;
7872 struct sctp_association *asoc; 7902 struct sctp_association *asoc;
7873 int retval = -EFAULT; 7903 int retval = -EFAULT;
7874 7904
7875 if (len < sizeof(params)) { 7905 if (len < sizeof(params)) {
7876 retval = -EINVAL; 7906 retval = -EINVAL;
7877 goto out; 7907 goto out;
7878 } 7908 }
7879 7909
7880 len = sizeof(params); 7910 len = sizeof(params);
7881 if (copy_from_user(¶ms, optval, l 7911 if (copy_from_user(¶ms, optval, len))
7882 goto out; 7912 goto out;
7883 7913
7884 asoc = sctp_id2assoc(sk, params.assoc 7914 asoc = sctp_id2assoc(sk, params.assoc_id);
7885 if (!asoc && params.assoc_id != SCTP_ 7915 if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
7886 sctp_style(sk, UDP)) { 7916 sctp_style(sk, UDP)) {
7887 retval = -EINVAL; 7917 retval = -EINVAL;
7888 goto out; 7918 goto out;
7889 } 7919 }
7890 7920
7891 params.assoc_value = asoc ? asoc->pee 7921 params.assoc_value = asoc ? asoc->peer.ecn_capable
7892 : sctp_sk(s 7922 : sctp_sk(sk)->ep->ecn_enable;
7893 7923
7894 if (put_user(len, optlen)) 7924 if (put_user(len, optlen))
7895 goto out; 7925 goto out;
7896 7926
7897 if (copy_to_user(optval, ¶ms, len 7927 if (copy_to_user(optval, ¶ms, len))
7898 goto out; 7928 goto out;
7899 7929
7900 retval = 0; 7930 retval = 0;
7901 7931
7902 out: 7932 out:
7903 return retval; 7933 return retval;
7904 } 7934 }
7905 7935
7906 static int sctp_getsockopt_pf_expose(struct s <<
7907 char __u <<
7908 int __us <<
7909 { <<
7910 struct sctp_assoc_value params; <<
7911 struct sctp_association *asoc; <<
7912 int retval = -EFAULT; <<
7913 <<
7914 if (len < sizeof(params)) { <<
7915 retval = -EINVAL; <<
7916 goto out; <<
7917 } <<
7918 <<
7919 len = sizeof(params); <<
7920 if (copy_from_user(¶ms, optval, l <<
7921 goto out; <<
7922 <<
7923 asoc = sctp_id2assoc(sk, params.assoc <<
7924 if (!asoc && params.assoc_id != SCTP_ <<
7925 sctp_style(sk, UDP)) { <<
7926 retval = -EINVAL; <<
7927 goto out; <<
7928 } <<
7929 <<
7930 params.assoc_value = asoc ? asoc->pf_ <<
7931 : sctp_sk(s <<
7932 <<
7933 if (put_user(len, optlen)) <<
7934 goto out; <<
7935 <<
7936 if (copy_to_user(optval, ¶ms, len <<
7937 goto out; <<
7938 <<
7939 retval = 0; <<
7940 <<
7941 out: <<
7942 return retval; <<
7943 } <<
7944 <<
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 7936 static int sctp_getsockopt(struct sock *sk, int level, int optname,
8065 char __user *optva 7937 char __user *optval, int __user *optlen)
8066 { 7938 {
8067 int retval = 0; 7939 int retval = 0;
8068 int len; 7940 int len;
8069 7941
8070 pr_debug("%s: sk:%p, optname:%d\n", _ 7942 pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
8071 7943
8072 /* I can hardly begin to describe how 7944 /* I can hardly begin to describe how wrong this is. This is
8073 * so broken as to be worse than usel 7945 * so broken as to be worse than useless. The API draft
8074 * REALLY is NOT helpful here... I a 7946 * REALLY is NOT helpful here... I am not convinced that the
8075 * semantics of getsockopt() with a l 7947 * semantics of getsockopt() with a level OTHER THAN SOL_SCTP
8076 * are at all well-founded. 7948 * are at all well-founded.
8077 */ 7949 */
8078 if (level != SOL_SCTP) { 7950 if (level != SOL_SCTP) {
8079 struct sctp_af *af = sctp_sk( 7951 struct sctp_af *af = sctp_sk(sk)->pf->af;
8080 7952
8081 retval = af->getsockopt(sk, l 7953 retval = af->getsockopt(sk, level, optname, optval, optlen);
8082 return retval; 7954 return retval;
8083 } 7955 }
8084 7956
8085 if (get_user(len, optlen)) 7957 if (get_user(len, optlen))
8086 return -EFAULT; 7958 return -EFAULT;
8087 7959
8088 if (len < 0) 7960 if (len < 0)
8089 return -EINVAL; 7961 return -EINVAL;
8090 7962
8091 lock_sock(sk); 7963 lock_sock(sk);
8092 7964
8093 switch (optname) { 7965 switch (optname) {
8094 case SCTP_STATUS: 7966 case SCTP_STATUS:
8095 retval = sctp_getsockopt_sctp 7967 retval = sctp_getsockopt_sctp_status(sk, len, optval, optlen);
8096 break; 7968 break;
8097 case SCTP_DISABLE_FRAGMENTS: 7969 case SCTP_DISABLE_FRAGMENTS:
8098 retval = sctp_getsockopt_disa 7970 retval = sctp_getsockopt_disable_fragments(sk, len, optval,
8099 7971 optlen);
8100 break; 7972 break;
8101 case SCTP_EVENTS: 7973 case SCTP_EVENTS:
8102 retval = sctp_getsockopt_even 7974 retval = sctp_getsockopt_events(sk, len, optval, optlen);
8103 break; 7975 break;
8104 case SCTP_AUTOCLOSE: 7976 case SCTP_AUTOCLOSE:
8105 retval = sctp_getsockopt_auto 7977 retval = sctp_getsockopt_autoclose(sk, len, optval, optlen);
8106 break; 7978 break;
8107 case SCTP_SOCKOPT_PEELOFF: 7979 case SCTP_SOCKOPT_PEELOFF:
8108 retval = sctp_getsockopt_peel 7980 retval = sctp_getsockopt_peeloff(sk, len, optval, optlen);
8109 break; 7981 break;
8110 case SCTP_SOCKOPT_PEELOFF_FLAGS: 7982 case SCTP_SOCKOPT_PEELOFF_FLAGS:
8111 retval = sctp_getsockopt_peel 7983 retval = sctp_getsockopt_peeloff_flags(sk, len, optval, optlen);
8112 break; 7984 break;
8113 case SCTP_PEER_ADDR_PARAMS: 7985 case SCTP_PEER_ADDR_PARAMS:
8114 retval = sctp_getsockopt_peer 7986 retval = sctp_getsockopt_peer_addr_params(sk, len, optval,
8115 7987 optlen);
8116 break; 7988 break;
8117 case SCTP_DELAYED_SACK: 7989 case SCTP_DELAYED_SACK:
8118 retval = sctp_getsockopt_dela 7990 retval = sctp_getsockopt_delayed_ack(sk, len, optval,
8119 7991 optlen);
8120 break; 7992 break;
8121 case SCTP_INITMSG: 7993 case SCTP_INITMSG:
8122 retval = sctp_getsockopt_init 7994 retval = sctp_getsockopt_initmsg(sk, len, optval, optlen);
8123 break; 7995 break;
8124 case SCTP_GET_PEER_ADDRS: 7996 case SCTP_GET_PEER_ADDRS:
8125 retval = sctp_getsockopt_peer 7997 retval = sctp_getsockopt_peer_addrs(sk, len, optval,
8126 7998 optlen);
8127 break; 7999 break;
8128 case SCTP_GET_LOCAL_ADDRS: 8000 case SCTP_GET_LOCAL_ADDRS:
8129 retval = sctp_getsockopt_loca 8001 retval = sctp_getsockopt_local_addrs(sk, len, optval,
8130 8002 optlen);
8131 break; 8003 break;
8132 case SCTP_SOCKOPT_CONNECTX3: 8004 case SCTP_SOCKOPT_CONNECTX3:
8133 retval = sctp_getsockopt_conn 8005 retval = sctp_getsockopt_connectx3(sk, len, optval, optlen);
8134 break; 8006 break;
8135 case SCTP_DEFAULT_SEND_PARAM: 8007 case SCTP_DEFAULT_SEND_PARAM:
8136 retval = sctp_getsockopt_defa 8008 retval = sctp_getsockopt_default_send_param(sk, len,
8137 8009 optval, optlen);
8138 break; 8010 break;
8139 case SCTP_DEFAULT_SNDINFO: 8011 case SCTP_DEFAULT_SNDINFO:
8140 retval = sctp_getsockopt_defa 8012 retval = sctp_getsockopt_default_sndinfo(sk, len,
8141 8013 optval, optlen);
8142 break; 8014 break;
8143 case SCTP_PRIMARY_ADDR: 8015 case SCTP_PRIMARY_ADDR:
8144 retval = sctp_getsockopt_prim 8016 retval = sctp_getsockopt_primary_addr(sk, len, optval, optlen);
8145 break; 8017 break;
8146 case SCTP_NODELAY: 8018 case SCTP_NODELAY:
8147 retval = sctp_getsockopt_node 8019 retval = sctp_getsockopt_nodelay(sk, len, optval, optlen);
8148 break; 8020 break;
8149 case SCTP_RTOINFO: 8021 case SCTP_RTOINFO:
8150 retval = sctp_getsockopt_rtoi 8022 retval = sctp_getsockopt_rtoinfo(sk, len, optval, optlen);
8151 break; 8023 break;
8152 case SCTP_ASSOCINFO: 8024 case SCTP_ASSOCINFO:
8153 retval = sctp_getsockopt_asso 8025 retval = sctp_getsockopt_associnfo(sk, len, optval, optlen);
8154 break; 8026 break;
8155 case SCTP_I_WANT_MAPPED_V4_ADDR: 8027 case SCTP_I_WANT_MAPPED_V4_ADDR:
8156 retval = sctp_getsockopt_mapp 8028 retval = sctp_getsockopt_mappedv4(sk, len, optval, optlen);
8157 break; 8029 break;
8158 case SCTP_MAXSEG: 8030 case SCTP_MAXSEG:
8159 retval = sctp_getsockopt_maxs 8031 retval = sctp_getsockopt_maxseg(sk, len, optval, optlen);
8160 break; 8032 break;
8161 case SCTP_GET_PEER_ADDR_INFO: 8033 case SCTP_GET_PEER_ADDR_INFO:
8162 retval = sctp_getsockopt_peer 8034 retval = sctp_getsockopt_peer_addr_info(sk, len, optval,
8163 8035 optlen);
8164 break; 8036 break;
8165 case SCTP_ADAPTATION_LAYER: 8037 case SCTP_ADAPTATION_LAYER:
8166 retval = sctp_getsockopt_adap 8038 retval = sctp_getsockopt_adaptation_layer(sk, len, optval,
8167 8039 optlen);
8168 break; 8040 break;
8169 case SCTP_CONTEXT: 8041 case SCTP_CONTEXT:
8170 retval = sctp_getsockopt_cont 8042 retval = sctp_getsockopt_context(sk, len, optval, optlen);
8171 break; 8043 break;
8172 case SCTP_FRAGMENT_INTERLEAVE: 8044 case SCTP_FRAGMENT_INTERLEAVE:
8173 retval = sctp_getsockopt_frag 8045 retval = sctp_getsockopt_fragment_interleave(sk, len, optval,
8174 8046 optlen);
8175 break; 8047 break;
8176 case SCTP_PARTIAL_DELIVERY_POINT: 8048 case SCTP_PARTIAL_DELIVERY_POINT:
8177 retval = sctp_getsockopt_part 8049 retval = sctp_getsockopt_partial_delivery_point(sk, len, optval,
8178 8050 optlen);
8179 break; 8051 break;
8180 case SCTP_MAX_BURST: 8052 case SCTP_MAX_BURST:
8181 retval = sctp_getsockopt_maxb 8053 retval = sctp_getsockopt_maxburst(sk, len, optval, optlen);
8182 break; 8054 break;
8183 case SCTP_AUTH_KEY: 8055 case SCTP_AUTH_KEY:
8184 case SCTP_AUTH_CHUNK: 8056 case SCTP_AUTH_CHUNK:
8185 case SCTP_AUTH_DELETE_KEY: 8057 case SCTP_AUTH_DELETE_KEY:
8186 case SCTP_AUTH_DEACTIVATE_KEY: 8058 case SCTP_AUTH_DEACTIVATE_KEY:
8187 retval = -EOPNOTSUPP; 8059 retval = -EOPNOTSUPP;
8188 break; 8060 break;
8189 case SCTP_HMAC_IDENT: 8061 case SCTP_HMAC_IDENT:
8190 retval = sctp_getsockopt_hmac 8062 retval = sctp_getsockopt_hmac_ident(sk, len, optval, optlen);
8191 break; 8063 break;
8192 case SCTP_AUTH_ACTIVE_KEY: 8064 case SCTP_AUTH_ACTIVE_KEY:
8193 retval = sctp_getsockopt_acti 8065 retval = sctp_getsockopt_active_key(sk, len, optval, optlen);
8194 break; 8066 break;
8195 case SCTP_PEER_AUTH_CHUNKS: 8067 case SCTP_PEER_AUTH_CHUNKS:
8196 retval = sctp_getsockopt_peer 8068 retval = sctp_getsockopt_peer_auth_chunks(sk, len, optval,
8197 8069 optlen);
8198 break; 8070 break;
8199 case SCTP_LOCAL_AUTH_CHUNKS: 8071 case SCTP_LOCAL_AUTH_CHUNKS:
8200 retval = sctp_getsockopt_loca 8072 retval = sctp_getsockopt_local_auth_chunks(sk, len, optval,
8201 8073 optlen);
8202 break; 8074 break;
8203 case SCTP_GET_ASSOC_NUMBER: 8075 case SCTP_GET_ASSOC_NUMBER:
8204 retval = sctp_getsockopt_asso 8076 retval = sctp_getsockopt_assoc_number(sk, len, optval, optlen);
8205 break; 8077 break;
8206 case SCTP_GET_ASSOC_ID_LIST: 8078 case SCTP_GET_ASSOC_ID_LIST:
8207 retval = sctp_getsockopt_asso 8079 retval = sctp_getsockopt_assoc_ids(sk, len, optval, optlen);
8208 break; 8080 break;
8209 case SCTP_AUTO_ASCONF: 8081 case SCTP_AUTO_ASCONF:
8210 retval = sctp_getsockopt_auto 8082 retval = sctp_getsockopt_auto_asconf(sk, len, optval, optlen);
8211 break; 8083 break;
8212 case SCTP_PEER_ADDR_THLDS: 8084 case SCTP_PEER_ADDR_THLDS:
8213 retval = sctp_getsockopt_padd !! 8085 retval = sctp_getsockopt_paddr_thresholds(sk, optval, len, optlen);
8214 <<
8215 break; <<
8216 case SCTP_PEER_ADDR_THLDS_V2: <<
8217 retval = sctp_getsockopt_padd <<
8218 <<
8219 break; 8086 break;
8220 case SCTP_GET_ASSOC_STATS: 8087 case SCTP_GET_ASSOC_STATS:
8221 retval = sctp_getsockopt_asso 8088 retval = sctp_getsockopt_assoc_stats(sk, len, optval, optlen);
8222 break; 8089 break;
8223 case SCTP_RECVRCVINFO: 8090 case SCTP_RECVRCVINFO:
8224 retval = sctp_getsockopt_recv 8091 retval = sctp_getsockopt_recvrcvinfo(sk, len, optval, optlen);
8225 break; 8092 break;
8226 case SCTP_RECVNXTINFO: 8093 case SCTP_RECVNXTINFO:
8227 retval = sctp_getsockopt_recv 8094 retval = sctp_getsockopt_recvnxtinfo(sk, len, optval, optlen);
8228 break; 8095 break;
8229 case SCTP_PR_SUPPORTED: 8096 case SCTP_PR_SUPPORTED:
8230 retval = sctp_getsockopt_pr_s 8097 retval = sctp_getsockopt_pr_supported(sk, len, optval, optlen);
8231 break; 8098 break;
8232 case SCTP_DEFAULT_PRINFO: 8099 case SCTP_DEFAULT_PRINFO:
8233 retval = sctp_getsockopt_defa 8100 retval = sctp_getsockopt_default_prinfo(sk, len, optval,
8234 8101 optlen);
8235 break; 8102 break;
8236 case SCTP_PR_ASSOC_STATUS: 8103 case SCTP_PR_ASSOC_STATUS:
8237 retval = sctp_getsockopt_pr_a 8104 retval = sctp_getsockopt_pr_assocstatus(sk, len, optval,
8238 8105 optlen);
8239 break; 8106 break;
8240 case SCTP_PR_STREAM_STATUS: 8107 case SCTP_PR_STREAM_STATUS:
8241 retval = sctp_getsockopt_pr_s 8108 retval = sctp_getsockopt_pr_streamstatus(sk, len, optval,
8242 8109 optlen);
8243 break; 8110 break;
8244 case SCTP_RECONFIG_SUPPORTED: 8111 case SCTP_RECONFIG_SUPPORTED:
8245 retval = sctp_getsockopt_reco 8112 retval = sctp_getsockopt_reconfig_supported(sk, len, optval,
8246 8113 optlen);
8247 break; 8114 break;
8248 case SCTP_ENABLE_STREAM_RESET: 8115 case SCTP_ENABLE_STREAM_RESET:
8249 retval = sctp_getsockopt_enab 8116 retval = sctp_getsockopt_enable_strreset(sk, len, optval,
8250 8117 optlen);
8251 break; 8118 break;
8252 case SCTP_STREAM_SCHEDULER: 8119 case SCTP_STREAM_SCHEDULER:
8253 retval = sctp_getsockopt_sche 8120 retval = sctp_getsockopt_scheduler(sk, len, optval,
8254 8121 optlen);
8255 break; 8122 break;
8256 case SCTP_STREAM_SCHEDULER_VALUE: 8123 case SCTP_STREAM_SCHEDULER_VALUE:
8257 retval = sctp_getsockopt_sche 8124 retval = sctp_getsockopt_scheduler_value(sk, len, optval,
8258 8125 optlen);
8259 break; 8126 break;
8260 case SCTP_INTERLEAVING_SUPPORTED: 8127 case SCTP_INTERLEAVING_SUPPORTED:
8261 retval = sctp_getsockopt_inte 8128 retval = sctp_getsockopt_interleaving_supported(sk, len, optval,
8262 8129 optlen);
8263 break; 8130 break;
8264 case SCTP_REUSE_PORT: 8131 case SCTP_REUSE_PORT:
8265 retval = sctp_getsockopt_reus 8132 retval = sctp_getsockopt_reuse_port(sk, len, optval, optlen);
8266 break; 8133 break;
8267 case SCTP_EVENT: 8134 case SCTP_EVENT:
8268 retval = sctp_getsockopt_even 8135 retval = sctp_getsockopt_event(sk, len, optval, optlen);
8269 break; 8136 break;
8270 case SCTP_ASCONF_SUPPORTED: 8137 case SCTP_ASCONF_SUPPORTED:
8271 retval = sctp_getsockopt_asco 8138 retval = sctp_getsockopt_asconf_supported(sk, len, optval,
8272 8139 optlen);
8273 break; 8140 break;
8274 case SCTP_AUTH_SUPPORTED: 8141 case SCTP_AUTH_SUPPORTED:
8275 retval = sctp_getsockopt_auth 8142 retval = sctp_getsockopt_auth_supported(sk, len, optval,
8276 8143 optlen);
8277 break; 8144 break;
8278 case SCTP_ECN_SUPPORTED: 8145 case SCTP_ECN_SUPPORTED:
8279 retval = sctp_getsockopt_ecn_ 8146 retval = sctp_getsockopt_ecn_supported(sk, len, optval, optlen);
8280 break; 8147 break;
8281 case SCTP_EXPOSE_POTENTIALLY_FAILED_S <<
8282 retval = sctp_getsockopt_pf_e <<
8283 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: 8148 default:
8291 retval = -ENOPROTOOPT; 8149 retval = -ENOPROTOOPT;
8292 break; 8150 break;
8293 } 8151 }
8294 8152
8295 release_sock(sk); 8153 release_sock(sk);
8296 return retval; 8154 return retval;
8297 } 8155 }
8298 8156
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) 8157 static int sctp_hash(struct sock *sk)
8316 { 8158 {
8317 /* STUB */ 8159 /* STUB */
8318 return 0; 8160 return 0;
8319 } 8161 }
8320 8162
8321 static void sctp_unhash(struct sock *sk) 8163 static void sctp_unhash(struct sock *sk)
8322 { 8164 {
8323 /* STUB */ 8165 /* STUB */
8324 } 8166 }
8325 8167
8326 /* Check if port is acceptable. Possibly fin 8168 /* Check if port is acceptable. Possibly find first available port.
8327 * 8169 *
8328 * The port hash table (contained in the 'glo 8170 * The port hash table (contained in the 'global' SCTP protocol storage
8329 * returned by struct sctp_protocol *sctp_get 8171 * returned by struct sctp_protocol *sctp_get_protocol()). The hash
8330 * table is an array of 4096 lists (sctp_bind 8172 * table is an array of 4096 lists (sctp_bind_hashbucket). Each
8331 * list (the list number is the port number h 8173 * list (the list number is the port number hashed out, so as you
8332 * would expect from a hash function, all the 8174 * would expect from a hash function, all the ports in a given list have
8333 * such a number that hashes out to the same 8175 * such a number that hashes out to the same list number; you were
8334 * expecting that, right?); so each list has 8176 * expecting that, right?); so each list has a set of ports, with a
8335 * link to the socket (struct sock) that uses 8177 * link to the socket (struct sock) that uses it, the port number and
8336 * a fastreuse flag (FIXME: NPI ipg). 8178 * a fastreuse flag (FIXME: NPI ipg).
8337 */ 8179 */
8338 static struct sctp_bind_bucket *sctp_bucket_c 8180 static struct sctp_bind_bucket *sctp_bucket_create(
8339 struct sctp_bind_hashbucket *head, st 8181 struct sctp_bind_hashbucket *head, struct net *, unsigned short snum);
8340 8182
8341 static int sctp_get_port_local(struct sock *s 8183 static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
8342 { 8184 {
8343 struct sctp_sock *sp = sctp_sk(sk); 8185 struct sctp_sock *sp = sctp_sk(sk);
8344 bool reuse = (sk->sk_reuse || sp->reu 8186 bool reuse = (sk->sk_reuse || sp->reuse);
8345 struct sctp_bind_hashbucket *head; /* 8187 struct sctp_bind_hashbucket *head; /* hash list */
8346 struct net *net = sock_net(sk); <<
8347 kuid_t uid = sock_i_uid(sk); 8188 kuid_t uid = sock_i_uid(sk);
8348 struct sctp_bind_bucket *pp; 8189 struct sctp_bind_bucket *pp;
8349 unsigned short snum; 8190 unsigned short snum;
8350 int ret; 8191 int ret;
8351 8192
8352 snum = ntohs(addr->v4.sin_port); 8193 snum = ntohs(addr->v4.sin_port);
8353 8194
8354 pr_debug("%s: begins, snum:%d\n", __f 8195 pr_debug("%s: begins, snum:%d\n", __func__, snum);
8355 8196
8356 if (snum == 0) { 8197 if (snum == 0) {
8357 /* Search for an available po 8198 /* Search for an available port. */
8358 int low, high, remaining, ind 8199 int low, high, remaining, index;
8359 unsigned int rover; 8200 unsigned int rover;
>> 8201 struct net *net = sock_net(sk);
8360 8202
8361 inet_sk_get_local_port_range( !! 8203 inet_get_local_port_range(net, &low, &high);
8362 remaining = (high - low) + 1; 8204 remaining = (high - low) + 1;
8363 rover = get_random_u32_below( !! 8205 rover = prandom_u32() % remaining + low;
8364 8206
8365 do { 8207 do {
8366 rover++; 8208 rover++;
8367 if ((rover < low) || 8209 if ((rover < low) || (rover > high))
8368 rover = low; 8210 rover = low;
8369 if (inet_is_local_res 8211 if (inet_is_local_reserved_port(net, rover))
8370 continue; 8212 continue;
8371 index = sctp_phashfn( !! 8213 index = sctp_phashfn(sock_net(sk), rover);
8372 head = &sctp_port_has 8214 head = &sctp_port_hashtable[index];
8373 spin_lock_bh(&head->l 8215 spin_lock_bh(&head->lock);
8374 sctp_for_each_hentry( 8216 sctp_for_each_hentry(pp, &head->chain)
8375 if ((pp->port 8217 if ((pp->port == rover) &&
8376 net_eq(ne !! 8218 net_eq(sock_net(sk), pp->net))
8377 goto 8219 goto next;
8378 break; 8220 break;
8379 next: 8221 next:
8380 spin_unlock_bh(&head- 8222 spin_unlock_bh(&head->lock);
8381 cond_resched(); 8223 cond_resched();
8382 } while (--remaining > 0); 8224 } while (--remaining > 0);
8383 8225
8384 /* Exhausted local port range 8226 /* Exhausted local port range during search? */
8385 ret = 1; 8227 ret = 1;
8386 if (remaining <= 0) 8228 if (remaining <= 0)
8387 return ret; 8229 return ret;
8388 8230
8389 /* OK, here is the one we wil 8231 /* OK, here is the one we will use. HEAD (the port
8390 * hash table list entry) is 8232 * hash table list entry) is non-NULL and we hold it's
8391 * mutex. 8233 * mutex.
8392 */ 8234 */
8393 snum = rover; 8235 snum = rover;
8394 } else { 8236 } else {
8395 /* We are given an specific p 8237 /* We are given an specific port number; we verify
8396 * that it is not being used. 8238 * that it is not being used. If it is used, we will
8397 * exahust the search in the 8239 * exahust the search in the hash list corresponding
8398 * to the port number (snum) 8240 * to the port number (snum) - we detect that with the
8399 * port iterator, pp being NU 8241 * port iterator, pp being NULL.
8400 */ 8242 */
8401 head = &sctp_port_hashtable[s !! 8243 head = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)];
8402 spin_lock_bh(&head->lock); 8244 spin_lock_bh(&head->lock);
8403 sctp_for_each_hentry(pp, &hea 8245 sctp_for_each_hentry(pp, &head->chain) {
8404 if ((pp->port == snum !! 8246 if ((pp->port == snum) && net_eq(pp->net, sock_net(sk)))
8405 goto pp_found 8247 goto pp_found;
8406 } 8248 }
8407 } 8249 }
8408 pp = NULL; 8250 pp = NULL;
8409 goto pp_not_found; 8251 goto pp_not_found;
8410 pp_found: 8252 pp_found:
8411 if (!hlist_empty(&pp->owner)) { 8253 if (!hlist_empty(&pp->owner)) {
8412 /* We had a port hash table h 8254 /* We had a port hash table hit - there is an
8413 * available port (pp != NULL 8255 * available port (pp != NULL) and it is being
8414 * used by other socket (pp-> 8256 * used by other socket (pp->owner not empty); that other
8415 * socket is going to be sk2. 8257 * socket is going to be sk2.
8416 */ 8258 */
8417 struct sock *sk2; 8259 struct sock *sk2;
8418 8260
8419 pr_debug("%s: found a possibl 8261 pr_debug("%s: found a possible match\n", __func__);
8420 8262
8421 if ((pp->fastreuse && reuse & 8263 if ((pp->fastreuse && reuse &&
8422 sk->sk_state != SCTP_SS_ 8264 sk->sk_state != SCTP_SS_LISTENING) ||
8423 (pp->fastreuseport && sk- 8265 (pp->fastreuseport && sk->sk_reuseport &&
8424 uid_eq(pp->fastuid, uid) 8266 uid_eq(pp->fastuid, uid)))
8425 goto success; 8267 goto success;
8426 8268
8427 /* Run through the list of so 8269 /* Run through the list of sockets bound to the port
8428 * (pp->port) [via the pointe 8270 * (pp->port) [via the pointers bind_next and
8429 * bind_pprev in the struct s 8271 * bind_pprev in the struct sock *sk2 (pp->sk)]. On each one,
8430 * we get the endpoint they d 8272 * we get the endpoint they describe and run through
8431 * the endpoint's list of IP 8273 * the endpoint's list of IP (v4 or v6) addresses,
8432 * comparing each of the addr 8274 * comparing each of the addresses with the address of
8433 * the socket sk. If we find 8275 * the socket sk. If we find a match, then that means
8434 * that this port/socket (sk) 8276 * that this port/socket (sk) combination are already
8435 * in an endpoint. 8277 * in an endpoint.
8436 */ 8278 */
8437 sk_for_each_bound(sk2, &pp->o 8279 sk_for_each_bound(sk2, &pp->owner) {
8438 int bound_dev_if2 = R <<
8439 struct sctp_sock *sp2 8280 struct sctp_sock *sp2 = sctp_sk(sk2);
8440 struct sctp_endpoint 8281 struct sctp_endpoint *ep2 = sp2->ep;
8441 8282
8442 if (sk == sk2 || 8283 if (sk == sk2 ||
8443 (reuse && (sk2->s 8284 (reuse && (sk2->sk_reuse || sp2->reuse) &&
8444 sk2->sk_state != 8285 sk2->sk_state != SCTP_SS_LISTENING) ||
8445 (sk->sk_reuseport 8286 (sk->sk_reuseport && sk2->sk_reuseport &&
8446 uid_eq(uid, sock 8287 uid_eq(uid, sock_i_uid(sk2))))
8447 continue; 8288 continue;
8448 8289
8449 if ((!sk->sk_bound_de !! 8290 if (sctp_bind_addr_conflict(&ep2->base.bind_addr,
8450 sk->sk_bound_dev <<
8451 sctp_bind_addr_co <<
8452 8291 addr, sp2, sp)) {
8453 ret = 1; 8292 ret = 1;
8454 goto fail_unl 8293 goto fail_unlock;
8455 } 8294 }
8456 } 8295 }
8457 8296
8458 pr_debug("%s: found a match\n 8297 pr_debug("%s: found a match\n", __func__);
8459 } 8298 }
8460 pp_not_found: 8299 pp_not_found:
8461 /* If there was a hash table miss, cr 8300 /* If there was a hash table miss, create a new port. */
8462 ret = 1; 8301 ret = 1;
8463 if (!pp && !(pp = sctp_bucket_create( !! 8302 if (!pp && !(pp = sctp_bucket_create(head, sock_net(sk), snum)))
8464 goto fail_unlock; 8303 goto fail_unlock;
8465 8304
8466 /* In either case (hit or miss), make 8305 /* In either case (hit or miss), make sure fastreuse is 1 only
8467 * if sk->sk_reuse is too (that is, i 8306 * if sk->sk_reuse is too (that is, if the caller requested
8468 * SO_REUSEADDR on this socket -sk-). 8307 * SO_REUSEADDR on this socket -sk-).
8469 */ 8308 */
8470 if (hlist_empty(&pp->owner)) { 8309 if (hlist_empty(&pp->owner)) {
8471 if (reuse && sk->sk_state != 8310 if (reuse && sk->sk_state != SCTP_SS_LISTENING)
8472 pp->fastreuse = 1; 8311 pp->fastreuse = 1;
8473 else 8312 else
8474 pp->fastreuse = 0; 8313 pp->fastreuse = 0;
8475 8314
8476 if (sk->sk_reuseport) { 8315 if (sk->sk_reuseport) {
8477 pp->fastreuseport = 1 8316 pp->fastreuseport = 1;
8478 pp->fastuid = uid; 8317 pp->fastuid = uid;
8479 } else { 8318 } else {
8480 pp->fastreuseport = 0 8319 pp->fastreuseport = 0;
8481 } 8320 }
8482 } else { 8321 } else {
8483 if (pp->fastreuse && 8322 if (pp->fastreuse &&
8484 (!reuse || sk->sk_state = 8323 (!reuse || sk->sk_state == SCTP_SS_LISTENING))
8485 pp->fastreuse = 0; 8324 pp->fastreuse = 0;
8486 8325
8487 if (pp->fastreuseport && 8326 if (pp->fastreuseport &&
8488 (!sk->sk_reuseport || !ui 8327 (!sk->sk_reuseport || !uid_eq(pp->fastuid, uid)))
8489 pp->fastreuseport = 0 8328 pp->fastreuseport = 0;
8490 } 8329 }
8491 8330
8492 /* We are set, so fill up all the dat 8331 /* We are set, so fill up all the data in the hash table
8493 * entry, tie the socket list informa 8332 * entry, tie the socket list information with the rest of the
8494 * sockets FIXME: Blurry, NPI (ipg). 8333 * sockets FIXME: Blurry, NPI (ipg).
8495 */ 8334 */
8496 success: 8335 success:
8497 if (!sp->bind_hash) { 8336 if (!sp->bind_hash) {
8498 inet_sk(sk)->inet_num = snum; 8337 inet_sk(sk)->inet_num = snum;
8499 sk_add_bind_node(sk, &pp->own 8338 sk_add_bind_node(sk, &pp->owner);
8500 sp->bind_hash = pp; 8339 sp->bind_hash = pp;
8501 } 8340 }
8502 ret = 0; 8341 ret = 0;
8503 8342
8504 fail_unlock: 8343 fail_unlock:
8505 spin_unlock_bh(&head->lock); 8344 spin_unlock_bh(&head->lock);
8506 return ret; 8345 return ret;
8507 } 8346 }
8508 8347
8509 /* Assign a 'snum' port to the socket. If sn 8348 /* Assign a 'snum' port to the socket. If snum == 0, an ephemeral
8510 * port is requested. 8349 * port is requested.
8511 */ 8350 */
8512 static int sctp_get_port(struct sock *sk, uns 8351 static int sctp_get_port(struct sock *sk, unsigned short snum)
8513 { 8352 {
8514 union sctp_addr addr; 8353 union sctp_addr addr;
8515 struct sctp_af *af = sctp_sk(sk)->pf- 8354 struct sctp_af *af = sctp_sk(sk)->pf->af;
8516 8355
8517 /* Set up a dummy address struct from 8356 /* Set up a dummy address struct from the sk. */
8518 af->from_sk(&addr, sk); 8357 af->from_sk(&addr, sk);
8519 addr.v4.sin_port = htons(snum); 8358 addr.v4.sin_port = htons(snum);
8520 8359
8521 /* Note: sk->sk_num gets filled in if 8360 /* Note: sk->sk_num gets filled in if ephemeral port request. */
8522 return sctp_get_port_local(sk, &addr) 8361 return sctp_get_port_local(sk, &addr);
8523 } 8362 }
8524 8363
8525 /* 8364 /*
8526 * Move a socket to LISTENING state. 8365 * Move a socket to LISTENING state.
8527 */ 8366 */
8528 static int sctp_listen_start(struct sock *sk, 8367 static int sctp_listen_start(struct sock *sk, int backlog)
8529 { 8368 {
8530 struct sctp_sock *sp = sctp_sk(sk); 8369 struct sctp_sock *sp = sctp_sk(sk);
8531 struct sctp_endpoint *ep = sp->ep; 8370 struct sctp_endpoint *ep = sp->ep;
8532 struct crypto_shash *tfm = NULL; 8371 struct crypto_shash *tfm = NULL;
8533 char alg[32]; 8372 char alg[32];
8534 int err; 8373 int err;
8535 8374
8536 /* Allocate HMAC for generating cooki 8375 /* Allocate HMAC for generating cookie. */
8537 if (!sp->hmac && sp->sctp_hmac_alg) { 8376 if (!sp->hmac && sp->sctp_hmac_alg) {
8538 sprintf(alg, "hmac(%s)", sp-> 8377 sprintf(alg, "hmac(%s)", sp->sctp_hmac_alg);
8539 tfm = crypto_alloc_shash(alg, 8378 tfm = crypto_alloc_shash(alg, 0, 0);
8540 if (IS_ERR(tfm)) { 8379 if (IS_ERR(tfm)) {
8541 net_info_ratelimited( 8380 net_info_ratelimited("failed to load transform for %s: %ld\n",
8542 8381 sp->sctp_hmac_alg, PTR_ERR(tfm));
8543 return -ENOSYS; 8382 return -ENOSYS;
8544 } 8383 }
8545 sctp_sk(sk)->hmac = tfm; 8384 sctp_sk(sk)->hmac = tfm;
8546 } 8385 }
8547 8386
8548 /* 8387 /*
8549 * If a bind() or sctp_bindx() is not 8388 * If a bind() or sctp_bindx() is not called prior to a listen()
8550 * call that allows new associations 8389 * call that allows new associations to be accepted, the system
8551 * picks an ephemeral port and will c 8390 * picks an ephemeral port and will choose an address set equivalent
8552 * to binding with a wildcard address 8391 * to binding with a wildcard address.
8553 * 8392 *
8554 * This is not currently spelled out 8393 * This is not currently spelled out in the SCTP sockets
8555 * extensions draft, but follows the 8394 * extensions draft, but follows the practice as seen in TCP
8556 * sockets. 8395 * sockets.
8557 * 8396 *
8558 */ 8397 */
8559 inet_sk_set_state(sk, SCTP_SS_LISTENI 8398 inet_sk_set_state(sk, SCTP_SS_LISTENING);
8560 if (!ep->base.bind_addr.port) { 8399 if (!ep->base.bind_addr.port) {
8561 if (sctp_autobind(sk)) { 8400 if (sctp_autobind(sk)) {
8562 err = -EAGAIN; 8401 err = -EAGAIN;
8563 goto err; 8402 goto err;
8564 } 8403 }
8565 } else { 8404 } else {
8566 if (sctp_get_port(sk, inet_sk 8405 if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
8567 err = -EADDRINUSE; 8406 err = -EADDRINUSE;
8568 goto err; 8407 goto err;
8569 } 8408 }
8570 } 8409 }
8571 8410
8572 WRITE_ONCE(sk->sk_max_ack_backlog, ba 8411 WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
8573 err = sctp_hash_endpoint(ep); 8412 err = sctp_hash_endpoint(ep);
8574 if (err) 8413 if (err)
8575 goto err; 8414 goto err;
8576 8415
8577 return 0; 8416 return 0;
8578 err: 8417 err:
8579 inet_sk_set_state(sk, SCTP_SS_CLOSED) 8418 inet_sk_set_state(sk, SCTP_SS_CLOSED);
8580 return err; 8419 return err;
8581 } 8420 }
8582 8421
8583 /* 8422 /*
8584 * 4.1.3 / 5.1.3 listen() 8423 * 4.1.3 / 5.1.3 listen()
8585 * 8424 *
8586 * By default, new associations are not acc 8425 * By default, new associations are not accepted for UDP style sockets.
8587 * An application uses listen() to mark a s 8426 * An application uses listen() to mark a socket as being able to
8588 * accept new associations. 8427 * accept new associations.
8589 * 8428 *
8590 * On TCP style sockets, applications use l 8429 * On TCP style sockets, applications use listen() to ready the SCTP
8591 * endpoint for accepting inbound associati 8430 * endpoint for accepting inbound associations.
8592 * 8431 *
8593 * On both types of endpoints a backlog of 8432 * On both types of endpoints a backlog of '' disables listening.
8594 * 8433 *
8595 * Move a socket to LISTENING state. 8434 * Move a socket to LISTENING state.
8596 */ 8435 */
8597 int sctp_inet_listen(struct socket *sock, int 8436 int sctp_inet_listen(struct socket *sock, int backlog)
8598 { 8437 {
8599 struct sock *sk = sock->sk; 8438 struct sock *sk = sock->sk;
8600 struct sctp_endpoint *ep = sctp_sk(sk 8439 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
8601 int err = -EINVAL; 8440 int err = -EINVAL;
8602 8441
8603 if (unlikely(backlog < 0)) 8442 if (unlikely(backlog < 0))
8604 return err; 8443 return err;
8605 8444
8606 lock_sock(sk); 8445 lock_sock(sk);
8607 8446
8608 /* Peeled-off sockets are not allowed 8447 /* Peeled-off sockets are not allowed to listen(). */
8609 if (sctp_style(sk, UDP_HIGH_BANDWIDTH 8448 if (sctp_style(sk, UDP_HIGH_BANDWIDTH))
8610 goto out; 8449 goto out;
8611 8450
8612 if (sock->state != SS_UNCONNECTED) 8451 if (sock->state != SS_UNCONNECTED)
8613 goto out; 8452 goto out;
8614 8453
8615 if (!sctp_sstate(sk, LISTENING) && !s 8454 if (!sctp_sstate(sk, LISTENING) && !sctp_sstate(sk, CLOSED))
8616 goto out; 8455 goto out;
8617 8456
8618 /* If backlog is zero, disable listen 8457 /* If backlog is zero, disable listening. */
8619 if (!backlog) { 8458 if (!backlog) {
8620 if (sctp_sstate(sk, CLOSED)) 8459 if (sctp_sstate(sk, CLOSED))
8621 goto out; 8460 goto out;
8622 8461
8623 err = 0; 8462 err = 0;
8624 sctp_unhash_endpoint(ep); 8463 sctp_unhash_endpoint(ep);
8625 sk->sk_state = SCTP_SS_CLOSED 8464 sk->sk_state = SCTP_SS_CLOSED;
8626 if (sk->sk_reuse || sctp_sk(s 8465 if (sk->sk_reuse || sctp_sk(sk)->reuse)
8627 sctp_sk(sk)->bind_has 8466 sctp_sk(sk)->bind_hash->fastreuse = 1;
8628 goto out; 8467 goto out;
8629 } 8468 }
8630 8469
8631 /* If we are already listening, just 8470 /* If we are already listening, just update the backlog */
8632 if (sctp_sstate(sk, LISTENING)) 8471 if (sctp_sstate(sk, LISTENING))
8633 WRITE_ONCE(sk->sk_max_ack_bac 8472 WRITE_ONCE(sk->sk_max_ack_backlog, backlog);
8634 else { 8473 else {
8635 err = sctp_listen_start(sk, b 8474 err = sctp_listen_start(sk, backlog);
8636 if (err) 8475 if (err)
8637 goto out; 8476 goto out;
8638 } 8477 }
8639 8478
8640 err = 0; 8479 err = 0;
8641 out: 8480 out:
8642 release_sock(sk); 8481 release_sock(sk);
8643 return err; 8482 return err;
8644 } 8483 }
8645 8484
8646 /* 8485 /*
8647 * This function is done by modeling the curr 8486 * This function is done by modeling the current datagram_poll() and the
8648 * tcp_poll(). Note that, based on these imp 8487 * tcp_poll(). Note that, based on these implementations, we don't
8649 * lock the socket in this function, even tho 8488 * lock the socket in this function, even though it seems that,
8650 * ideally, locking or some other mechanisms 8489 * ideally, locking or some other mechanisms can be used to ensure
8651 * the integrity of the counters (sndbuf and 8490 * the integrity of the counters (sndbuf and wmem_alloc) used
8652 * in this place. We assume that we don't ne 8491 * in this place. We assume that we don't need locks either until proven
8653 * otherwise. 8492 * otherwise.
8654 * 8493 *
8655 * Another thing to note is that we include t 8494 * Another thing to note is that we include the Async I/O support
8656 * here, again, by modeling the current TCP/U 8495 * here, again, by modeling the current TCP/UDP code. We don't have
8657 * a good way to test with it yet. 8496 * a good way to test with it yet.
8658 */ 8497 */
8659 __poll_t sctp_poll(struct file *file, struct 8498 __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
8660 { 8499 {
8661 struct sock *sk = sock->sk; 8500 struct sock *sk = sock->sk;
8662 struct sctp_sock *sp = sctp_sk(sk); 8501 struct sctp_sock *sp = sctp_sk(sk);
8663 __poll_t mask; 8502 __poll_t mask;
8664 8503
8665 poll_wait(file, sk_sleep(sk), wait); 8504 poll_wait(file, sk_sleep(sk), wait);
8666 8505
8667 sock_rps_record_flow(sk); 8506 sock_rps_record_flow(sk);
8668 8507
8669 /* A TCP-style listening socket becom 8508 /* A TCP-style listening socket becomes readable when the accept queue
8670 * is not empty. 8509 * is not empty.
8671 */ 8510 */
8672 if (sctp_style(sk, TCP) && sctp_sstat 8511 if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
8673 return (!list_empty(&sp->ep-> 8512 return (!list_empty(&sp->ep->asocs)) ?
8674 (EPOLLIN | EPOLLRDNOR 8513 (EPOLLIN | EPOLLRDNORM) : 0;
8675 8514
8676 mask = 0; 8515 mask = 0;
8677 8516
8678 /* Is there any exceptional events? 8517 /* Is there any exceptional events? */
8679 if (sk->sk_err || !skb_queue_empty_lo 8518 if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
8680 mask |= EPOLLERR | 8519 mask |= EPOLLERR |
8681 (sock_flag(sk, SOCK_S 8520 (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
8682 if (sk->sk_shutdown & RCV_SHUTDOWN) 8521 if (sk->sk_shutdown & RCV_SHUTDOWN)
8683 mask |= EPOLLRDHUP | EPOLLIN 8522 mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
8684 if (sk->sk_shutdown == SHUTDOWN_MASK) 8523 if (sk->sk_shutdown == SHUTDOWN_MASK)
8685 mask |= EPOLLHUP; 8524 mask |= EPOLLHUP;
8686 8525
8687 /* Is it readable? Reconsider this c 8526 /* Is it readable? Reconsider this code with TCP-style support. */
8688 if (!skb_queue_empty_lockless(&sk->sk 8527 if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
8689 mask |= EPOLLIN | EPOLLRDNORM 8528 mask |= EPOLLIN | EPOLLRDNORM;
8690 8529
8691 /* The association is either gone or 8530 /* The association is either gone or not ready. */
8692 if (!sctp_style(sk, UDP) && sctp_ssta 8531 if (!sctp_style(sk, UDP) && sctp_sstate(sk, CLOSED))
8693 return mask; 8532 return mask;
8694 8533
8695 /* Is it writable? */ 8534 /* Is it writable? */
8696 if (sctp_writeable(sk)) { 8535 if (sctp_writeable(sk)) {
8697 mask |= EPOLLOUT | EPOLLWRNOR 8536 mask |= EPOLLOUT | EPOLLWRNORM;
8698 } else { 8537 } else {
8699 sk_set_bit(SOCKWQ_ASYNC_NOSPA 8538 sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
8700 /* 8539 /*
8701 * Since the socket is not lo 8540 * Since the socket is not locked, the buffer
8702 * might be made available af 8541 * might be made available after the writeable check and
8703 * before the bit is set. Th 8542 * before the bit is set. This could cause a lost I/O
8704 * signal. tcp_poll() has a 8543 * signal. tcp_poll() has a race breaker for this race
8705 * condition. Based on their 8544 * condition. Based on their implementation, we put
8706 * in the following code to c 8545 * in the following code to cover it as well.
8707 */ 8546 */
8708 if (sctp_writeable(sk)) 8547 if (sctp_writeable(sk))
8709 mask |= EPOLLOUT | EP 8548 mask |= EPOLLOUT | EPOLLWRNORM;
8710 } 8549 }
8711 return mask; 8550 return mask;
8712 } 8551 }
8713 8552
8714 /******************************************** 8553 /********************************************************************
8715 * 2nd Level Abstractions 8554 * 2nd Level Abstractions
8716 ******************************************** 8555 ********************************************************************/
8717 8556
8718 static struct sctp_bind_bucket *sctp_bucket_c 8557 static struct sctp_bind_bucket *sctp_bucket_create(
8719 struct sctp_bind_hashbucket *head, st 8558 struct sctp_bind_hashbucket *head, struct net *net, unsigned short snum)
8720 { 8559 {
8721 struct sctp_bind_bucket *pp; 8560 struct sctp_bind_bucket *pp;
8722 8561
8723 pp = kmem_cache_alloc(sctp_bucket_cac 8562 pp = kmem_cache_alloc(sctp_bucket_cachep, GFP_ATOMIC);
8724 if (pp) { 8563 if (pp) {
8725 SCTP_DBG_OBJCNT_INC(bind_buck 8564 SCTP_DBG_OBJCNT_INC(bind_bucket);
8726 pp->port = snum; 8565 pp->port = snum;
8727 pp->fastreuse = 0; 8566 pp->fastreuse = 0;
8728 INIT_HLIST_HEAD(&pp->owner); 8567 INIT_HLIST_HEAD(&pp->owner);
8729 pp->net = net; 8568 pp->net = net;
8730 hlist_add_head(&pp->node, &he 8569 hlist_add_head(&pp->node, &head->chain);
8731 } 8570 }
8732 return pp; 8571 return pp;
8733 } 8572 }
8734 8573
8735 /* Caller must hold hashbucket lock for this 8574 /* Caller must hold hashbucket lock for this tb with local BH disabled */
8736 static void sctp_bucket_destroy(struct sctp_b 8575 static void sctp_bucket_destroy(struct sctp_bind_bucket *pp)
8737 { 8576 {
8738 if (pp && hlist_empty(&pp->owner)) { 8577 if (pp && hlist_empty(&pp->owner)) {
8739 __hlist_del(&pp->node); 8578 __hlist_del(&pp->node);
8740 kmem_cache_free(sctp_bucket_c 8579 kmem_cache_free(sctp_bucket_cachep, pp);
8741 SCTP_DBG_OBJCNT_DEC(bind_buck 8580 SCTP_DBG_OBJCNT_DEC(bind_bucket);
8742 } 8581 }
8743 } 8582 }
8744 8583
8745 /* Release this socket's reference to a local 8584 /* Release this socket's reference to a local port. */
8746 static inline void __sctp_put_port(struct soc 8585 static inline void __sctp_put_port(struct sock *sk)
8747 { 8586 {
8748 struct sctp_bind_hashbucket *head = 8587 struct sctp_bind_hashbucket *head =
8749 &sctp_port_hashtable[sctp_pha 8588 &sctp_port_hashtable[sctp_phashfn(sock_net(sk),
8750 8589 inet_sk(sk)->inet_num)];
8751 struct sctp_bind_bucket *pp; 8590 struct sctp_bind_bucket *pp;
8752 8591
8753 spin_lock(&head->lock); 8592 spin_lock(&head->lock);
8754 pp = sctp_sk(sk)->bind_hash; 8593 pp = sctp_sk(sk)->bind_hash;
8755 __sk_del_bind_node(sk); 8594 __sk_del_bind_node(sk);
8756 sctp_sk(sk)->bind_hash = NULL; 8595 sctp_sk(sk)->bind_hash = NULL;
8757 inet_sk(sk)->inet_num = 0; 8596 inet_sk(sk)->inet_num = 0;
8758 sctp_bucket_destroy(pp); 8597 sctp_bucket_destroy(pp);
8759 spin_unlock(&head->lock); 8598 spin_unlock(&head->lock);
8760 } 8599 }
8761 8600
8762 void sctp_put_port(struct sock *sk) 8601 void sctp_put_port(struct sock *sk)
8763 { 8602 {
8764 local_bh_disable(); 8603 local_bh_disable();
8765 __sctp_put_port(sk); 8604 __sctp_put_port(sk);
8766 local_bh_enable(); 8605 local_bh_enable();
8767 } 8606 }
8768 8607
8769 /* 8608 /*
8770 * The system picks an ephemeral port and cho 8609 * The system picks an ephemeral port and choose an address set equivalent
8771 * to binding with a wildcard address. 8610 * to binding with a wildcard address.
8772 * One of those addresses will be the primary 8611 * One of those addresses will be the primary address for the association.
8773 * This automatically enables the multihoming 8612 * This automatically enables the multihoming capability of SCTP.
8774 */ 8613 */
8775 static int sctp_autobind(struct sock *sk) 8614 static int sctp_autobind(struct sock *sk)
8776 { 8615 {
8777 union sctp_addr autoaddr; 8616 union sctp_addr autoaddr;
8778 struct sctp_af *af; 8617 struct sctp_af *af;
8779 __be16 port; 8618 __be16 port;
8780 8619
8781 /* Initialize a local sockaddr struct 8620 /* Initialize a local sockaddr structure to INADDR_ANY. */
8782 af = sctp_sk(sk)->pf->af; 8621 af = sctp_sk(sk)->pf->af;
8783 8622
8784 port = htons(inet_sk(sk)->inet_num); 8623 port = htons(inet_sk(sk)->inet_num);
8785 af->inaddr_any(&autoaddr, port); 8624 af->inaddr_any(&autoaddr, port);
8786 8625
8787 return sctp_do_bind(sk, &autoaddr, af 8626 return sctp_do_bind(sk, &autoaddr, af->sockaddr_len);
8788 } 8627 }
8789 8628
8790 /* Parse out IPPROTO_SCTP CMSG headers. Perf 8629 /* Parse out IPPROTO_SCTP CMSG headers. Perform only minimal validation.
8791 * 8630 *
8792 * From RFC 2292 8631 * From RFC 2292
8793 * 4.2 The cmsghdr Structure * 8632 * 4.2 The cmsghdr Structure *
8794 * 8633 *
8795 * When ancillary data is sent or received, a 8634 * When ancillary data is sent or received, any number of ancillary data
8796 * objects can be specified by the msg_contro 8635 * objects can be specified by the msg_control and msg_controllen members of
8797 * the msghdr structure, because each object 8636 * the msghdr structure, because each object is preceded by
8798 * a cmsghdr structure defining the object's 8637 * a cmsghdr structure defining the object's length (the cmsg_len member).
8799 * Historically Berkeley-derived implementati 8638 * Historically Berkeley-derived implementations have passed only one object
8800 * at a time, but this API allows multiple ob 8639 * at a time, but this API allows multiple objects to be
8801 * passed in a single call to sendmsg() or re 8640 * passed in a single call to sendmsg() or recvmsg(). The following example
8802 * shows two ancillary data objects in a cont 8641 * shows two ancillary data objects in a control buffer.
8803 * 8642 *
8804 * |<--------------------------- msg_contro 8643 * |<--------------------------- msg_controllen -------------------------->|
8805 * | 8644 * | |
8806 * 8645 *
8807 * |<----- ancillary data object ----->|<-- 8646 * |<----- ancillary data object ----->|<----- ancillary data object ----->|
8808 * 8647 *
8809 * |<---------- CMSG_SPACE() --------->|<-- 8648 * |<---------- CMSG_SPACE() --------->|<---------- CMSG_SPACE() --------->|
8810 * | | 8649 * | | |
8811 * 8650 *
8812 * |<---------- cmsg_len ---------->| |<-- 8651 * |<---------- cmsg_len ---------->| |<--------- cmsg_len ----------->| |
8813 * 8652 *
8814 * |<--------- CMSG_LEN() --------->| |<-- 8653 * |<--------- CMSG_LEN() --------->| |<-------- CMSG_LEN() ---------->| |
8815 * | | | 8654 * | | | | |
8816 * 8655 *
8817 * +-----+-----+-----+--+-----------+--+--- 8656 * +-----+-----+-----+--+-----------+--+-----+-----+-----+--+-----------+--+
8818 * |cmsg_|cmsg_|cmsg_|XX| |XX|cms 8657 * |cmsg_|cmsg_|cmsg_|XX| |XX|cmsg_|cmsg_|cmsg_|XX| |XX|
8819 * 8658 *
8820 * |len |level|type |XX|cmsg_data[]|XX|len 8659 * |len |level|type |XX|cmsg_data[]|XX|len |level|type |XX|cmsg_data[]|XX|
8821 * 8660 *
8822 * +-----+-----+-----+--+-----------+--+--- 8661 * +-----+-----+-----+--+-----------+--+-----+-----+-----+--+-----------+--+
8823 * ^ 8662 * ^
8824 * | 8663 * |
8825 * 8664 *
8826 * msg_control 8665 * msg_control
8827 * points here 8666 * points here
8828 */ 8667 */
8829 static int sctp_msghdr_parse(const struct msg 8668 static int sctp_msghdr_parse(const struct msghdr *msg, struct sctp_cmsgs *cmsgs)
8830 { 8669 {
8831 struct msghdr *my_msg = (struct msghd 8670 struct msghdr *my_msg = (struct msghdr *)msg;
8832 struct cmsghdr *cmsg; 8671 struct cmsghdr *cmsg;
8833 8672
8834 for_each_cmsghdr(cmsg, my_msg) { 8673 for_each_cmsghdr(cmsg, my_msg) {
8835 if (!CMSG_OK(my_msg, cmsg)) 8674 if (!CMSG_OK(my_msg, cmsg))
8836 return -EINVAL; 8675 return -EINVAL;
8837 8676
8838 /* Should we parse this heade 8677 /* Should we parse this header or ignore? */
8839 if (cmsg->cmsg_level != IPPRO 8678 if (cmsg->cmsg_level != IPPROTO_SCTP)
8840 continue; 8679 continue;
8841 8680
8842 /* Strictly check lengths fol 8681 /* Strictly check lengths following example in SCM code. */
8843 switch (cmsg->cmsg_type) { 8682 switch (cmsg->cmsg_type) {
8844 case SCTP_INIT: 8683 case SCTP_INIT:
8845 /* SCTP Socket API Ex 8684 /* SCTP Socket API Extension
8846 * 5.3.1 SCTP Initiat 8685 * 5.3.1 SCTP Initiation Structure (SCTP_INIT)
8847 * 8686 *
8848 * This cmsghdr struc 8687 * This cmsghdr structure provides information for
8849 * initializing new S 8688 * initializing new SCTP associations with sendmsg().
8850 * The SCTP_INITMSG s 8689 * The SCTP_INITMSG socket option uses this same data
8851 * structure. This s 8690 * structure. This structure is not used for
8852 * recvmsg(). 8691 * recvmsg().
8853 * 8692 *
8854 * cmsg_level cmsg 8693 * cmsg_level cmsg_type cmsg_data[]
8855 * ------------ ---- 8694 * ------------ ------------ ----------------------
8856 * IPPROTO_SCTP SCTP 8695 * IPPROTO_SCTP SCTP_INIT struct sctp_initmsg
8857 */ 8696 */
8858 if (cmsg->cmsg_len != 8697 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_initmsg)))
8859 return -EINVA 8698 return -EINVAL;
8860 8699
8861 cmsgs->init = CMSG_DA 8700 cmsgs->init = CMSG_DATA(cmsg);
8862 break; 8701 break;
8863 8702
8864 case SCTP_SNDRCV: 8703 case SCTP_SNDRCV:
8865 /* SCTP Socket API Ex 8704 /* SCTP Socket API Extension
8866 * 5.3.2 SCTP Header 8705 * 5.3.2 SCTP Header Information Structure(SCTP_SNDRCV)
8867 * 8706 *
8868 * This cmsghdr struc 8707 * This cmsghdr structure specifies SCTP options for
8869 * sendmsg() and desc 8708 * sendmsg() and describes SCTP header information
8870 * about a received m 8709 * about a received message through recvmsg().
8871 * 8710 *
8872 * cmsg_level cmsg 8711 * cmsg_level cmsg_type cmsg_data[]
8873 * ------------ ---- 8712 * ------------ ------------ ----------------------
8874 * IPPROTO_SCTP SCTP 8713 * IPPROTO_SCTP SCTP_SNDRCV struct sctp_sndrcvinfo
8875 */ 8714 */
8876 if (cmsg->cmsg_len != 8715 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_sndrcvinfo)))
8877 return -EINVA 8716 return -EINVAL;
8878 8717
8879 cmsgs->srinfo = CMSG_ 8718 cmsgs->srinfo = CMSG_DATA(cmsg);
8880 8719
8881 if (cmsgs->srinfo->si 8720 if (cmsgs->srinfo->sinfo_flags &
8882 ~(SCTP_UNORDERED 8721 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
8883 SCTP_SACK_IMMED 8722 SCTP_SACK_IMMEDIATELY | SCTP_SENDALL |
8884 SCTP_PR_SCTP_MA 8723 SCTP_PR_SCTP_MASK | SCTP_ABORT | SCTP_EOF))
8885 return -EINVA 8724 return -EINVAL;
8886 break; 8725 break;
8887 8726
8888 case SCTP_SNDINFO: 8727 case SCTP_SNDINFO:
8889 /* SCTP Socket API Ex 8728 /* SCTP Socket API Extension
8890 * 5.3.4 SCTP Send In 8729 * 5.3.4 SCTP Send Information Structure (SCTP_SNDINFO)
8891 * 8730 *
8892 * This cmsghdr struc 8731 * This cmsghdr structure specifies SCTP options for
8893 * sendmsg(). This st 8732 * sendmsg(). This structure and SCTP_RCVINFO replaces
8894 * SCTP_SNDRCV which 8733 * SCTP_SNDRCV which has been deprecated.
8895 * 8734 *
8896 * cmsg_level cmsg 8735 * cmsg_level cmsg_type cmsg_data[]
8897 * ------------ ---- 8736 * ------------ ------------ ---------------------
8898 * IPPROTO_SCTP SCTP 8737 * IPPROTO_SCTP SCTP_SNDINFO struct sctp_sndinfo
8899 */ 8738 */
8900 if (cmsg->cmsg_len != 8739 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_sndinfo)))
8901 return -EINVA 8740 return -EINVAL;
8902 8741
8903 cmsgs->sinfo = CMSG_D 8742 cmsgs->sinfo = CMSG_DATA(cmsg);
8904 8743
8905 if (cmsgs->sinfo->snd 8744 if (cmsgs->sinfo->snd_flags &
8906 ~(SCTP_UNORDERED 8745 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
8907 SCTP_SACK_IMMED 8746 SCTP_SACK_IMMEDIATELY | SCTP_SENDALL |
8908 SCTP_PR_SCTP_MA 8747 SCTP_PR_SCTP_MASK | SCTP_ABORT | SCTP_EOF))
8909 return -EINVA 8748 return -EINVAL;
8910 break; 8749 break;
8911 case SCTP_PRINFO: 8750 case SCTP_PRINFO:
8912 /* SCTP Socket API Ex 8751 /* SCTP Socket API Extension
8913 * 5.3.7 SCTP PR-SCTP 8752 * 5.3.7 SCTP PR-SCTP Information Structure (SCTP_PRINFO)
8914 * 8753 *
8915 * This cmsghdr struc 8754 * This cmsghdr structure specifies SCTP options for sendmsg().
8916 * 8755 *
8917 * cmsg_level cmsg 8756 * cmsg_level cmsg_type cmsg_data[]
8918 * ------------ ---- 8757 * ------------ ------------ ---------------------
8919 * IPPROTO_SCTP SCTP 8758 * IPPROTO_SCTP SCTP_PRINFO struct sctp_prinfo
8920 */ 8759 */
8921 if (cmsg->cmsg_len != 8760 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_prinfo)))
8922 return -EINVA 8761 return -EINVAL;
8923 8762
8924 cmsgs->prinfo = CMSG_ 8763 cmsgs->prinfo = CMSG_DATA(cmsg);
8925 if (cmsgs->prinfo->pr 8764 if (cmsgs->prinfo->pr_policy & ~SCTP_PR_SCTP_MASK)
8926 return -EINVA 8765 return -EINVAL;
8927 8766
8928 if (cmsgs->prinfo->pr 8767 if (cmsgs->prinfo->pr_policy == SCTP_PR_SCTP_NONE)
8929 cmsgs->prinfo 8768 cmsgs->prinfo->pr_value = 0;
8930 break; 8769 break;
8931 case SCTP_AUTHINFO: 8770 case SCTP_AUTHINFO:
8932 /* SCTP Socket API Ex 8771 /* SCTP Socket API Extension
8933 * 5.3.8 SCTP AUTH In 8772 * 5.3.8 SCTP AUTH Information Structure (SCTP_AUTHINFO)
8934 * 8773 *
8935 * This cmsghdr struc 8774 * This cmsghdr structure specifies SCTP options for sendmsg().
8936 * 8775 *
8937 * cmsg_level cmsg 8776 * cmsg_level cmsg_type cmsg_data[]
8938 * ------------ ---- 8777 * ------------ ------------ ---------------------
8939 * IPPROTO_SCTP SCTP 8778 * IPPROTO_SCTP SCTP_AUTHINFO struct sctp_authinfo
8940 */ 8779 */
8941 if (cmsg->cmsg_len != 8780 if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct sctp_authinfo)))
8942 return -EINVA 8781 return -EINVAL;
8943 8782
8944 cmsgs->authinfo = CMS 8783 cmsgs->authinfo = CMSG_DATA(cmsg);
8945 break; 8784 break;
8946 case SCTP_DSTADDRV4: 8785 case SCTP_DSTADDRV4:
8947 case SCTP_DSTADDRV6: 8786 case SCTP_DSTADDRV6:
8948 /* SCTP Socket API Ex 8787 /* SCTP Socket API Extension
8949 * 5.3.9/10 SCTP Dest 8788 * 5.3.9/10 SCTP Destination IPv4/6 Address Structure (SCTP_DSTADDRV4/6)
8950 * 8789 *
8951 * This cmsghdr struc 8790 * This cmsghdr structure specifies SCTP options for sendmsg().
8952 * 8791 *
8953 * cmsg_level cmsg 8792 * cmsg_level cmsg_type cmsg_data[]
8954 * ------------ ---- 8793 * ------------ ------------ ---------------------
8955 * IPPROTO_SCTP SCTP 8794 * IPPROTO_SCTP SCTP_DSTADDRV4 struct in_addr
8956 * ------------ ---- 8795 * ------------ ------------ ---------------------
8957 * IPPROTO_SCTP SCTP 8796 * IPPROTO_SCTP SCTP_DSTADDRV6 struct in6_addr
8958 */ 8797 */
8959 cmsgs->addrs_msg = my 8798 cmsgs->addrs_msg = my_msg;
8960 break; 8799 break;
8961 default: 8800 default:
8962 return -EINVAL; 8801 return -EINVAL;
8963 } 8802 }
8964 } 8803 }
8965 8804
8966 return 0; 8805 return 0;
8967 } 8806 }
8968 8807
8969 /* 8808 /*
8970 * Wait for a packet.. 8809 * Wait for a packet..
8971 * Note: This function is the same function a 8810 * Note: This function is the same function as in core/datagram.c
8972 * with a few modifications to make lksctp wo 8811 * with a few modifications to make lksctp work.
8973 */ 8812 */
8974 static int sctp_wait_for_packet(struct sock * 8813 static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p)
8975 { 8814 {
8976 int error; 8815 int error;
8977 DEFINE_WAIT(wait); 8816 DEFINE_WAIT(wait);
8978 8817
8979 prepare_to_wait_exclusive(sk_sleep(sk 8818 prepare_to_wait_exclusive(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
8980 8819
8981 /* Socket errors? */ 8820 /* Socket errors? */
8982 error = sock_error(sk); 8821 error = sock_error(sk);
8983 if (error) 8822 if (error)
8984 goto out; 8823 goto out;
8985 8824
8986 if (!skb_queue_empty(&sk->sk_receive_ 8825 if (!skb_queue_empty(&sk->sk_receive_queue))
8987 goto ready; 8826 goto ready;
8988 8827
8989 /* Socket shut down? */ 8828 /* Socket shut down? */
8990 if (sk->sk_shutdown & RCV_SHUTDOWN) 8829 if (sk->sk_shutdown & RCV_SHUTDOWN)
8991 goto out; 8830 goto out;
8992 8831
8993 /* Sequenced packets can come disconn 8832 /* Sequenced packets can come disconnected. If so we report the
8994 * problem. 8833 * problem.
8995 */ 8834 */
8996 error = -ENOTCONN; 8835 error = -ENOTCONN;
8997 8836
8998 /* Is there a good reason to think th 8837 /* Is there a good reason to think that we may receive some data? */
8999 if (list_empty(&sctp_sk(sk)->ep->asoc 8838 if (list_empty(&sctp_sk(sk)->ep->asocs) && !sctp_sstate(sk, LISTENING))
9000 goto out; 8839 goto out;
9001 8840
9002 /* Handle signals. */ 8841 /* Handle signals. */
9003 if (signal_pending(current)) 8842 if (signal_pending(current))
9004 goto interrupted; 8843 goto interrupted;
9005 8844
9006 /* Let another process have a go. Si 8845 /* Let another process have a go. Since we are going to sleep
9007 * anyway. Note: This may cause odd 8846 * anyway. Note: This may cause odd behaviors if the message
9008 * does not fit in the user's buffer, 8847 * does not fit in the user's buffer, but this seems to be the
9009 * only way to honor MSG_DONTWAIT rea 8848 * only way to honor MSG_DONTWAIT realistically.
9010 */ 8849 */
9011 release_sock(sk); 8850 release_sock(sk);
9012 *timeo_p = schedule_timeout(*timeo_p) 8851 *timeo_p = schedule_timeout(*timeo_p);
9013 lock_sock(sk); 8852 lock_sock(sk);
9014 8853
9015 ready: 8854 ready:
9016 finish_wait(sk_sleep(sk), &wait); 8855 finish_wait(sk_sleep(sk), &wait);
9017 return 0; 8856 return 0;
9018 8857
9019 interrupted: 8858 interrupted:
9020 error = sock_intr_errno(*timeo_p); 8859 error = sock_intr_errno(*timeo_p);
9021 8860
9022 out: 8861 out:
9023 finish_wait(sk_sleep(sk), &wait); 8862 finish_wait(sk_sleep(sk), &wait);
9024 *err = error; 8863 *err = error;
9025 return error; 8864 return error;
9026 } 8865 }
9027 8866
9028 /* Receive a datagram. 8867 /* Receive a datagram.
9029 * Note: This is pretty much the same routine 8868 * Note: This is pretty much the same routine as in core/datagram.c
9030 * with a few changes to make lksctp work. 8869 * with a few changes to make lksctp work.
9031 */ 8870 */
9032 struct sk_buff *sctp_skb_recv_datagram(struct !! 8871 struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
>> 8872 int noblock, int *err)
9033 { 8873 {
9034 int error; 8874 int error;
9035 struct sk_buff *skb; 8875 struct sk_buff *skb;
9036 long timeo; 8876 long timeo;
9037 8877
9038 timeo = sock_rcvtimeo(sk, flags & MSG !! 8878 timeo = sock_rcvtimeo(sk, noblock);
9039 8879
9040 pr_debug("%s: timeo:%ld, max:%ld\n", 8880 pr_debug("%s: timeo:%ld, max:%ld\n", __func__, timeo,
9041 MAX_SCHEDULE_TIMEOUT); 8881 MAX_SCHEDULE_TIMEOUT);
9042 8882
9043 do { 8883 do {
9044 /* Again only user level code 8884 /* Again only user level code calls this function,
9045 * so nothing interrupt level 8885 * so nothing interrupt level
9046 * will suddenly eat the rece 8886 * will suddenly eat the receive_queue.
9047 * 8887 *
9048 * Look at current nfs clien 8888 * Look at current nfs client by the way...
9049 * However, this function wa 8889 * However, this function was correct in any case. 8)
9050 */ 8890 */
9051 if (flags & MSG_PEEK) { 8891 if (flags & MSG_PEEK) {
9052 skb = skb_peek(&sk->s 8892 skb = skb_peek(&sk->sk_receive_queue);
9053 if (skb) 8893 if (skb)
9054 refcount_inc( 8894 refcount_inc(&skb->users);
9055 } else { 8895 } else {
9056 skb = __skb_dequeue(& 8896 skb = __skb_dequeue(&sk->sk_receive_queue);
9057 } 8897 }
9058 8898
9059 if (skb) 8899 if (skb)
9060 return skb; 8900 return skb;
9061 8901
9062 /* Caller is allowed not to c 8902 /* Caller is allowed not to check sk->sk_err before calling. */
9063 error = sock_error(sk); 8903 error = sock_error(sk);
9064 if (error) 8904 if (error)
9065 goto no_packet; 8905 goto no_packet;
9066 8906
9067 if (sk->sk_shutdown & RCV_SHU 8907 if (sk->sk_shutdown & RCV_SHUTDOWN)
9068 break; 8908 break;
9069 8909
>> 8910 if (sk_can_busy_loop(sk)) {
>> 8911 sk_busy_loop(sk, noblock);
>> 8912
>> 8913 if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
>> 8914 continue;
>> 8915 }
9070 8916
9071 /* User doesn't want to wait. 8917 /* User doesn't want to wait. */
9072 error = -EAGAIN; 8918 error = -EAGAIN;
9073 if (!timeo) 8919 if (!timeo)
9074 goto no_packet; 8920 goto no_packet;
9075 } while (sctp_wait_for_packet(sk, err 8921 } while (sctp_wait_for_packet(sk, err, &timeo) == 0);
9076 8922
9077 return NULL; 8923 return NULL;
9078 8924
9079 no_packet: 8925 no_packet:
9080 *err = error; 8926 *err = error;
9081 return NULL; 8927 return NULL;
9082 } 8928 }
9083 8929
9084 /* If sndbuf has changed, wake up per associa 8930 /* If sndbuf has changed, wake up per association sndbuf waiters. */
9085 static void __sctp_write_space(struct sctp_as 8931 static void __sctp_write_space(struct sctp_association *asoc)
9086 { 8932 {
9087 struct sock *sk = asoc->base.sk; 8933 struct sock *sk = asoc->base.sk;
9088 8934
9089 if (sctp_wspace(asoc) <= 0) 8935 if (sctp_wspace(asoc) <= 0)
9090 return; 8936 return;
9091 8937
9092 if (waitqueue_active(&asoc->wait)) 8938 if (waitqueue_active(&asoc->wait))
9093 wake_up_interruptible(&asoc-> 8939 wake_up_interruptible(&asoc->wait);
9094 8940
9095 if (sctp_writeable(sk)) { 8941 if (sctp_writeable(sk)) {
9096 struct socket_wq *wq; 8942 struct socket_wq *wq;
9097 8943
9098 rcu_read_lock(); 8944 rcu_read_lock();
9099 wq = rcu_dereference(sk->sk_w 8945 wq = rcu_dereference(sk->sk_wq);
9100 if (wq) { 8946 if (wq) {
9101 if (waitqueue_active( 8947 if (waitqueue_active(&wq->wait))
9102 wake_up_inter 8948 wake_up_interruptible(&wq->wait);
9103 8949
9104 /* Note that we try t 8950 /* Note that we try to include the Async I/O support
9105 * here by modeling f 8951 * here by modeling from the current TCP/UDP code.
9106 * We have not tested 8952 * We have not tested with it yet.
9107 */ 8953 */
9108 if (!(sk->sk_shutdown 8954 if (!(sk->sk_shutdown & SEND_SHUTDOWN))
9109 sock_wake_asy 8955 sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT);
9110 } 8956 }
9111 rcu_read_unlock(); 8957 rcu_read_unlock();
9112 } 8958 }
9113 } 8959 }
9114 8960
9115 static void sctp_wake_up_waiters(struct sock 8961 static void sctp_wake_up_waiters(struct sock *sk,
9116 struct sctp_ 8962 struct sctp_association *asoc)
9117 { 8963 {
9118 struct sctp_association *tmp = asoc; 8964 struct sctp_association *tmp = asoc;
9119 8965
9120 /* We do accounting for the sndbuf sp 8966 /* We do accounting for the sndbuf space per association,
9121 * so we only need to wake our own as 8967 * so we only need to wake our own association.
9122 */ 8968 */
9123 if (asoc->ep->sndbuf_policy) 8969 if (asoc->ep->sndbuf_policy)
9124 return __sctp_write_space(aso 8970 return __sctp_write_space(asoc);
9125 8971
9126 /* If association goes down and is ju 8972 /* If association goes down and is just flushing its
9127 * outq, then just normally notify ot 8973 * outq, then just normally notify others.
9128 */ 8974 */
9129 if (asoc->base.dead) 8975 if (asoc->base.dead)
9130 return sctp_write_space(sk); 8976 return sctp_write_space(sk);
9131 8977
9132 /* Accounting for the sndbuf space is 8978 /* Accounting for the sndbuf space is per socket, so we
9133 * need to wake up others, try to be 8979 * need to wake up others, try to be fair and in case of
9134 * other associations, let them have 8980 * other associations, let them have a go first instead
9135 * of just doing a sctp_write_space() 8981 * of just doing a sctp_write_space() call.
9136 * 8982 *
9137 * Note that we reach sctp_wake_up_wa 8983 * Note that we reach sctp_wake_up_waiters() only when
9138 * associations free up queued chunks 8984 * associations free up queued chunks, thus we are under
9139 * lock and the list of associations 8985 * lock and the list of associations on a socket is
9140 * guaranteed not to change. 8986 * guaranteed not to change.
9141 */ 8987 */
9142 for (tmp = list_next_entry(tmp, asocs 8988 for (tmp = list_next_entry(tmp, asocs); 1;
9143 tmp = list_next_entry(tmp, asocs 8989 tmp = list_next_entry(tmp, asocs)) {
9144 /* Manually skip the head ele 8990 /* Manually skip the head element. */
9145 if (&tmp->asocs == &((sctp_sk 8991 if (&tmp->asocs == &((sctp_sk(sk))->ep->asocs))
9146 continue; 8992 continue;
9147 /* Wake up association. */ 8993 /* Wake up association. */
9148 __sctp_write_space(tmp); 8994 __sctp_write_space(tmp);
9149 /* We've reached the end. */ 8995 /* We've reached the end. */
9150 if (tmp == asoc) 8996 if (tmp == asoc)
9151 break; 8997 break;
9152 } 8998 }
9153 } 8999 }
9154 9000
9155 /* Do accounting for the sndbuf space. 9001 /* Do accounting for the sndbuf space.
9156 * Decrement the used sndbuf space of the cor 9002 * Decrement the used sndbuf space of the corresponding association by the
9157 * data size which was just transmitted(freed 9003 * data size which was just transmitted(freed).
9158 */ 9004 */
9159 static void sctp_wfree(struct sk_buff *skb) 9005 static void sctp_wfree(struct sk_buff *skb)
9160 { 9006 {
9161 struct sctp_chunk *chunk = skb_shinfo 9007 struct sctp_chunk *chunk = skb_shinfo(skb)->destructor_arg;
9162 struct sctp_association *asoc = chunk 9008 struct sctp_association *asoc = chunk->asoc;
9163 struct sock *sk = asoc->base.sk; 9009 struct sock *sk = asoc->base.sk;
9164 9010
9165 sk_mem_uncharge(sk, skb->truesize); 9011 sk_mem_uncharge(sk, skb->truesize);
9166 sk_wmem_queued_add(sk, -(skb->truesiz 9012 sk_wmem_queued_add(sk, -(skb->truesize + sizeof(struct sctp_chunk)));
9167 asoc->sndbuf_used -= skb->truesize + 9013 asoc->sndbuf_used -= skb->truesize + sizeof(struct sctp_chunk);
9168 WARN_ON(refcount_sub_and_test(sizeof( 9014 WARN_ON(refcount_sub_and_test(sizeof(struct sctp_chunk),
9169 &sk->sk 9015 &sk->sk_wmem_alloc));
9170 9016
9171 if (chunk->shkey) { 9017 if (chunk->shkey) {
9172 struct sctp_shared_key *shkey 9018 struct sctp_shared_key *shkey = chunk->shkey;
9173 9019
9174 /* refcnt == 2 and !list_empt 9020 /* refcnt == 2 and !list_empty mean after this release, it's
9175 * not being used anywhere, a 9021 * not being used anywhere, and it's time to notify userland
9176 * that this shkey can be fre 9022 * that this shkey can be freed if it's been deactivated.
9177 */ 9023 */
9178 if (shkey->deactivated && !li 9024 if (shkey->deactivated && !list_empty(&shkey->key_list) &&
9179 refcount_read(&shkey->ref 9025 refcount_read(&shkey->refcnt) == 2) {
9180 struct sctp_ulpevent 9026 struct sctp_ulpevent *ev;
9181 9027
9182 ev = sctp_ulpevent_ma 9028 ev = sctp_ulpevent_make_authkey(asoc, shkey->key_id,
9183 9029 SCTP_AUTH_FREE_KEY,
9184 9030 GFP_KERNEL);
9185 if (ev) 9031 if (ev)
9186 asoc->stream. 9032 asoc->stream.si->enqueue_event(&asoc->ulpq, ev);
9187 } 9033 }
9188 sctp_auth_shkey_release(chunk 9034 sctp_auth_shkey_release(chunk->shkey);
9189 } 9035 }
9190 9036
9191 sock_wfree(skb); 9037 sock_wfree(skb);
9192 sctp_wake_up_waiters(sk, asoc); 9038 sctp_wake_up_waiters(sk, asoc);
9193 9039
9194 sctp_association_put(asoc); 9040 sctp_association_put(asoc);
9195 } 9041 }
9196 9042
9197 /* Do accounting for the receive space on the 9043 /* Do accounting for the receive space on the socket.
9198 * Accounting for the association is done in 9044 * Accounting for the association is done in ulpevent.c
9199 * We set this as a destructor for the cloned 9045 * We set this as a destructor for the cloned data skbs so that
9200 * accounting is done at the correct time. 9046 * accounting is done at the correct time.
9201 */ 9047 */
9202 void sctp_sock_rfree(struct sk_buff *skb) 9048 void sctp_sock_rfree(struct sk_buff *skb)
9203 { 9049 {
9204 struct sock *sk = skb->sk; 9050 struct sock *sk = skb->sk;
9205 struct sctp_ulpevent *event = sctp_sk 9051 struct sctp_ulpevent *event = sctp_skb2event(skb);
9206 9052
9207 atomic_sub(event->rmem_len, &sk->sk_r 9053 atomic_sub(event->rmem_len, &sk->sk_rmem_alloc);
9208 9054
9209 /* 9055 /*
9210 * Mimic the behavior of sock_rfree 9056 * Mimic the behavior of sock_rfree
9211 */ 9057 */
9212 sk_mem_uncharge(sk, event->rmem_len); 9058 sk_mem_uncharge(sk, event->rmem_len);
9213 } 9059 }
9214 9060
9215 9061
9216 /* Helper function to wait for space in the s 9062 /* Helper function to wait for space in the sndbuf. */
9217 static int sctp_wait_for_sndbuf(struct sctp_a 9063 static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
9218 size_t msg_le 9064 size_t msg_len)
9219 { 9065 {
9220 struct sock *sk = asoc->base.sk; 9066 struct sock *sk = asoc->base.sk;
9221 long current_timeo = *timeo_p; 9067 long current_timeo = *timeo_p;
9222 DEFINE_WAIT(wait); 9068 DEFINE_WAIT(wait);
9223 int err = 0; 9069 int err = 0;
9224 9070
9225 pr_debug("%s: asoc:%p, timeo:%ld, msg 9071 pr_debug("%s: asoc:%p, timeo:%ld, msg_len:%zu\n", __func__, asoc,
9226 *timeo_p, msg_len); 9072 *timeo_p, msg_len);
9227 9073
9228 /* Increment the association's refcnt 9074 /* Increment the association's refcnt. */
9229 sctp_association_hold(asoc); 9075 sctp_association_hold(asoc);
9230 9076
9231 /* Wait on the association specific s 9077 /* Wait on the association specific sndbuf space. */
9232 for (;;) { 9078 for (;;) {
9233 prepare_to_wait_exclusive(&as 9079 prepare_to_wait_exclusive(&asoc->wait, &wait,
9234 TAS 9080 TASK_INTERRUPTIBLE);
9235 if (asoc->base.dead) 9081 if (asoc->base.dead)
9236 goto do_dead; 9082 goto do_dead;
9237 if (!*timeo_p) 9083 if (!*timeo_p)
9238 goto do_nonblock; 9084 goto do_nonblock;
9239 if (sk->sk_err || asoc->state 9085 if (sk->sk_err || asoc->state >= SCTP_STATE_SHUTDOWN_PENDING)
9240 goto do_error; 9086 goto do_error;
9241 if (signal_pending(current)) 9087 if (signal_pending(current))
9242 goto do_interrupted; 9088 goto do_interrupted;
>> 9089 if (sk_under_memory_pressure(sk))
>> 9090 sk_mem_reclaim(sk);
9243 if ((int)msg_len <= sctp_wspa 9091 if ((int)msg_len <= sctp_wspace(asoc) &&
9244 sk_wmem_schedule(sk, msg_ 9092 sk_wmem_schedule(sk, msg_len))
9245 break; 9093 break;
9246 9094
9247 /* Let another process have a 9095 /* Let another process have a go. Since we are going
9248 * to sleep anyway. 9096 * to sleep anyway.
9249 */ 9097 */
9250 release_sock(sk); 9098 release_sock(sk);
9251 current_timeo = schedule_time 9099 current_timeo = schedule_timeout(current_timeo);
9252 lock_sock(sk); 9100 lock_sock(sk);
9253 if (sk != asoc->base.sk) 9101 if (sk != asoc->base.sk)
9254 goto do_error; 9102 goto do_error;
9255 9103
9256 *timeo_p = current_timeo; 9104 *timeo_p = current_timeo;
9257 } 9105 }
9258 9106
9259 out: 9107 out:
9260 finish_wait(&asoc->wait, &wait); 9108 finish_wait(&asoc->wait, &wait);
9261 9109
9262 /* Release the association's refcnt. 9110 /* Release the association's refcnt. */
9263 sctp_association_put(asoc); 9111 sctp_association_put(asoc);
9264 9112
9265 return err; 9113 return err;
9266 9114
9267 do_dead: 9115 do_dead:
9268 err = -ESRCH; 9116 err = -ESRCH;
9269 goto out; 9117 goto out;
9270 9118
9271 do_error: 9119 do_error:
9272 err = -EPIPE; 9120 err = -EPIPE;
9273 goto out; 9121 goto out;
9274 9122
9275 do_interrupted: 9123 do_interrupted:
9276 err = sock_intr_errno(*timeo_p); 9124 err = sock_intr_errno(*timeo_p);
9277 goto out; 9125 goto out;
9278 9126
9279 do_nonblock: 9127 do_nonblock:
9280 err = -EAGAIN; 9128 err = -EAGAIN;
9281 goto out; 9129 goto out;
9282 } 9130 }
9283 9131
9284 void sctp_data_ready(struct sock *sk) 9132 void sctp_data_ready(struct sock *sk)
9285 { 9133 {
9286 struct socket_wq *wq; 9134 struct socket_wq *wq;
9287 9135
9288 trace_sk_data_ready(sk); <<
9289 <<
9290 rcu_read_lock(); 9136 rcu_read_lock();
9291 wq = rcu_dereference(sk->sk_wq); 9137 wq = rcu_dereference(sk->sk_wq);
9292 if (skwq_has_sleeper(wq)) 9138 if (skwq_has_sleeper(wq))
9293 wake_up_interruptible_sync_po 9139 wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN |
9294 9140 EPOLLRDNORM | EPOLLRDBAND);
9295 sk_wake_async_rcu(sk, SOCK_WAKE_WAITD !! 9141 sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
9296 rcu_read_unlock(); 9142 rcu_read_unlock();
9297 } 9143 }
9298 9144
9299 /* If socket sndbuf has changed, wake up all 9145 /* If socket sndbuf has changed, wake up all per association waiters. */
9300 void sctp_write_space(struct sock *sk) 9146 void sctp_write_space(struct sock *sk)
9301 { 9147 {
9302 struct sctp_association *asoc; 9148 struct sctp_association *asoc;
9303 9149
9304 /* Wake up the tasks in each wait que 9150 /* Wake up the tasks in each wait queue. */
9305 list_for_each_entry(asoc, &((sctp_sk( 9151 list_for_each_entry(asoc, &((sctp_sk(sk))->ep->asocs), asocs) {
9306 __sctp_write_space(asoc); 9152 __sctp_write_space(asoc);
9307 } 9153 }
9308 } 9154 }
9309 9155
9310 /* Is there any sndbuf space available on the 9156 /* Is there any sndbuf space available on the socket?
9311 * 9157 *
9312 * Note that sk_wmem_alloc is the sum of the 9158 * 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 9159 * associations on the same socket. For a UDP-style socket with
9314 * multiple associations, it is possible for 9160 * multiple associations, it is possible for it to be "unwriteable"
9315 * prematurely. I assume that this is accept 9161 * prematurely. I assume that this is acceptable because
9316 * a premature "unwriteable" is better than a 9162 * a premature "unwriteable" is better than an accidental "writeable" which
9317 * would cause an unwanted block under certai 9163 * would cause an unwanted block under certain circumstances. For the 1-1
9318 * UDP-style sockets or TCP-style sockets, th 9164 * UDP-style sockets or TCP-style sockets, this code should work.
9319 * - Daisy 9165 * - Daisy
9320 */ 9166 */
9321 static bool sctp_writeable(const struct sock 9167 static bool sctp_writeable(const struct sock *sk)
9322 { 9168 {
9323 return READ_ONCE(sk->sk_sndbuf) > REA 9169 return READ_ONCE(sk->sk_sndbuf) > READ_ONCE(sk->sk_wmem_queued);
9324 } 9170 }
9325 9171
9326 /* Wait for an association to go into ESTABLI 9172 /* Wait for an association to go into ESTABLISHED state. If timeout is 0,
9327 * returns immediately with EINPROGRESS. 9173 * returns immediately with EINPROGRESS.
9328 */ 9174 */
9329 static int sctp_wait_for_connect(struct sctp_ 9175 static int sctp_wait_for_connect(struct sctp_association *asoc, long *timeo_p)
9330 { 9176 {
9331 struct sock *sk = asoc->base.sk; 9177 struct sock *sk = asoc->base.sk;
9332 int err = 0; 9178 int err = 0;
9333 long current_timeo = *timeo_p; 9179 long current_timeo = *timeo_p;
9334 DEFINE_WAIT(wait); 9180 DEFINE_WAIT(wait);
9335 9181
9336 pr_debug("%s: asoc:%p, timeo:%ld\n", 9182 pr_debug("%s: asoc:%p, timeo:%ld\n", __func__, asoc, *timeo_p);
9337 9183
9338 /* Increment the association's refcnt 9184 /* Increment the association's refcnt. */
9339 sctp_association_hold(asoc); 9185 sctp_association_hold(asoc);
9340 9186
9341 for (;;) { 9187 for (;;) {
9342 prepare_to_wait_exclusive(&as 9188 prepare_to_wait_exclusive(&asoc->wait, &wait,
9343 TAS 9189 TASK_INTERRUPTIBLE);
9344 if (!*timeo_p) 9190 if (!*timeo_p)
9345 goto do_nonblock; 9191 goto do_nonblock;
9346 if (sk->sk_shutdown & RCV_SHU 9192 if (sk->sk_shutdown & RCV_SHUTDOWN)
9347 break; 9193 break;
9348 if (sk->sk_err || asoc->state 9194 if (sk->sk_err || asoc->state >= SCTP_STATE_SHUTDOWN_PENDING ||
9349 asoc->base.dead) 9195 asoc->base.dead)
9350 goto do_error; 9196 goto do_error;
9351 if (signal_pending(current)) 9197 if (signal_pending(current))
9352 goto do_interrupted; 9198 goto do_interrupted;
9353 9199
9354 if (sctp_state(asoc, ESTABLIS 9200 if (sctp_state(asoc, ESTABLISHED))
9355 break; 9201 break;
9356 9202
9357 /* Let another process have a 9203 /* Let another process have a go. Since we are going
9358 * to sleep anyway. 9204 * to sleep anyway.
9359 */ 9205 */
9360 release_sock(sk); 9206 release_sock(sk);
9361 current_timeo = schedule_time 9207 current_timeo = schedule_timeout(current_timeo);
9362 lock_sock(sk); 9208 lock_sock(sk);
9363 9209
9364 *timeo_p = current_timeo; 9210 *timeo_p = current_timeo;
9365 } 9211 }
9366 9212
9367 out: 9213 out:
9368 finish_wait(&asoc->wait, &wait); 9214 finish_wait(&asoc->wait, &wait);
9369 9215
9370 /* Release the association's refcnt. 9216 /* Release the association's refcnt. */
9371 sctp_association_put(asoc); 9217 sctp_association_put(asoc);
9372 9218
9373 return err; 9219 return err;
9374 9220
9375 do_error: 9221 do_error:
9376 if (asoc->init_err_counter + 1 > asoc 9222 if (asoc->init_err_counter + 1 > asoc->max_init_attempts)
9377 err = -ETIMEDOUT; 9223 err = -ETIMEDOUT;
9378 else 9224 else
9379 err = -ECONNREFUSED; 9225 err = -ECONNREFUSED;
9380 goto out; 9226 goto out;
9381 9227
9382 do_interrupted: 9228 do_interrupted:
9383 err = sock_intr_errno(*timeo_p); 9229 err = sock_intr_errno(*timeo_p);
9384 goto out; 9230 goto out;
9385 9231
9386 do_nonblock: 9232 do_nonblock:
9387 err = -EINPROGRESS; 9233 err = -EINPROGRESS;
9388 goto out; 9234 goto out;
9389 } 9235 }
9390 9236
9391 static int sctp_wait_for_accept(struct sock * 9237 static int sctp_wait_for_accept(struct sock *sk, long timeo)
9392 { 9238 {
9393 struct sctp_endpoint *ep; 9239 struct sctp_endpoint *ep;
9394 int err = 0; 9240 int err = 0;
9395 DEFINE_WAIT(wait); 9241 DEFINE_WAIT(wait);
9396 9242
9397 ep = sctp_sk(sk)->ep; 9243 ep = sctp_sk(sk)->ep;
9398 9244
9399 9245
9400 for (;;) { 9246 for (;;) {
9401 prepare_to_wait_exclusive(sk_ 9247 prepare_to_wait_exclusive(sk_sleep(sk), &wait,
9402 TAS 9248 TASK_INTERRUPTIBLE);
9403 9249
9404 if (list_empty(&ep->asocs)) { 9250 if (list_empty(&ep->asocs)) {
9405 release_sock(sk); 9251 release_sock(sk);
9406 timeo = schedule_time 9252 timeo = schedule_timeout(timeo);
9407 lock_sock(sk); 9253 lock_sock(sk);
9408 } 9254 }
9409 9255
9410 err = -EINVAL; 9256 err = -EINVAL;
9411 if (!sctp_sstate(sk, LISTENIN !! 9257 if (!sctp_sstate(sk, LISTENING))
9412 (sk->sk_shutdown & RCV_SH <<
9413 break; 9258 break;
9414 9259
9415 err = 0; 9260 err = 0;
9416 if (!list_empty(&ep->asocs)) 9261 if (!list_empty(&ep->asocs))
9417 break; 9262 break;
9418 9263
9419 err = sock_intr_errno(timeo); 9264 err = sock_intr_errno(timeo);
9420 if (signal_pending(current)) 9265 if (signal_pending(current))
9421 break; 9266 break;
9422 9267
9423 err = -EAGAIN; 9268 err = -EAGAIN;
9424 if (!timeo) 9269 if (!timeo)
9425 break; 9270 break;
9426 } 9271 }
9427 9272
9428 finish_wait(sk_sleep(sk), &wait); 9273 finish_wait(sk_sleep(sk), &wait);
9429 9274
9430 return err; 9275 return err;
9431 } 9276 }
9432 9277
9433 static void sctp_wait_for_close(struct sock * 9278 static void sctp_wait_for_close(struct sock *sk, long timeout)
9434 { 9279 {
9435 DEFINE_WAIT(wait); 9280 DEFINE_WAIT(wait);
9436 9281
9437 do { 9282 do {
9438 prepare_to_wait(sk_sleep(sk), 9283 prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
9439 if (list_empty(&sctp_sk(sk)-> 9284 if (list_empty(&sctp_sk(sk)->ep->asocs))
9440 break; 9285 break;
9441 release_sock(sk); 9286 release_sock(sk);
9442 timeout = schedule_timeout(ti 9287 timeout = schedule_timeout(timeout);
9443 lock_sock(sk); 9288 lock_sock(sk);
9444 } while (!signal_pending(current) && 9289 } while (!signal_pending(current) && timeout);
9445 9290
9446 finish_wait(sk_sleep(sk), &wait); 9291 finish_wait(sk_sleep(sk), &wait);
9447 } 9292 }
9448 9293
9449 static void sctp_skb_set_owner_r_frag(struct 9294 static void sctp_skb_set_owner_r_frag(struct sk_buff *skb, struct sock *sk)
9450 { 9295 {
9451 struct sk_buff *frag; 9296 struct sk_buff *frag;
9452 9297
9453 if (!skb->data_len) 9298 if (!skb->data_len)
9454 goto done; 9299 goto done;
9455 9300
9456 /* Don't forget the fragments. */ 9301 /* Don't forget the fragments. */
9457 skb_walk_frags(skb, frag) 9302 skb_walk_frags(skb, frag)
9458 sctp_skb_set_owner_r_frag(fra 9303 sctp_skb_set_owner_r_frag(frag, sk);
9459 9304
9460 done: 9305 done:
9461 sctp_skb_set_owner_r(skb, sk); 9306 sctp_skb_set_owner_r(skb, sk);
9462 } 9307 }
9463 9308
9464 void sctp_copy_sock(struct sock *newsk, struc 9309 void sctp_copy_sock(struct sock *newsk, struct sock *sk,
9465 struct sctp_association * 9310 struct sctp_association *asoc)
9466 { 9311 {
9467 struct inet_sock *inet = inet_sk(sk); 9312 struct inet_sock *inet = inet_sk(sk);
9468 struct inet_sock *newinet; 9313 struct inet_sock *newinet;
9469 struct sctp_sock *sp = sctp_sk(sk); 9314 struct sctp_sock *sp = sctp_sk(sk);
>> 9315 struct sctp_endpoint *ep = sp->ep;
9470 9316
9471 newsk->sk_type = sk->sk_type; 9317 newsk->sk_type = sk->sk_type;
9472 newsk->sk_bound_dev_if = sk->sk_bound 9318 newsk->sk_bound_dev_if = sk->sk_bound_dev_if;
9473 newsk->sk_flags = sk->sk_flags; 9319 newsk->sk_flags = sk->sk_flags;
9474 newsk->sk_tsflags = sk->sk_tsflags; 9320 newsk->sk_tsflags = sk->sk_tsflags;
9475 newsk->sk_no_check_tx = sk->sk_no_che 9321 newsk->sk_no_check_tx = sk->sk_no_check_tx;
9476 newsk->sk_no_check_rx = sk->sk_no_che 9322 newsk->sk_no_check_rx = sk->sk_no_check_rx;
9477 newsk->sk_reuse = sk->sk_reuse; 9323 newsk->sk_reuse = sk->sk_reuse;
9478 sctp_sk(newsk)->reuse = sp->reuse; 9324 sctp_sk(newsk)->reuse = sp->reuse;
9479 9325
9480 newsk->sk_shutdown = sk->sk_shutdown; 9326 newsk->sk_shutdown = sk->sk_shutdown;
9481 newsk->sk_destruct = sk->sk_destruct; 9327 newsk->sk_destruct = sk->sk_destruct;
9482 newsk->sk_family = sk->sk_family; 9328 newsk->sk_family = sk->sk_family;
9483 newsk->sk_protocol = IPPROTO_SCTP; 9329 newsk->sk_protocol = IPPROTO_SCTP;
9484 newsk->sk_backlog_rcv = sk->sk_prot-> 9330 newsk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
9485 newsk->sk_sndbuf = sk->sk_sndbuf; 9331 newsk->sk_sndbuf = sk->sk_sndbuf;
9486 newsk->sk_rcvbuf = sk->sk_rcvbuf; 9332 newsk->sk_rcvbuf = sk->sk_rcvbuf;
9487 newsk->sk_lingertime = sk->sk_lingert 9333 newsk->sk_lingertime = sk->sk_lingertime;
9488 newsk->sk_rcvtimeo = sk->sk_rcvtimeo; 9334 newsk->sk_rcvtimeo = sk->sk_rcvtimeo;
9489 newsk->sk_sndtimeo = sk->sk_sndtimeo; 9335 newsk->sk_sndtimeo = sk->sk_sndtimeo;
9490 newsk->sk_rxhash = sk->sk_rxhash; 9336 newsk->sk_rxhash = sk->sk_rxhash;
9491 9337
9492 newinet = inet_sk(newsk); 9338 newinet = inet_sk(newsk);
9493 9339
9494 /* Initialize sk's sport, dport, rcv_ 9340 /* Initialize sk's sport, dport, rcv_saddr and daddr for
9495 * getsockname() and getpeername() 9341 * getsockname() and getpeername()
9496 */ 9342 */
9497 newinet->inet_sport = inet->inet_spor 9343 newinet->inet_sport = inet->inet_sport;
9498 newinet->inet_saddr = inet->inet_sadd 9344 newinet->inet_saddr = inet->inet_saddr;
9499 newinet->inet_rcv_saddr = inet->inet_ 9345 newinet->inet_rcv_saddr = inet->inet_rcv_saddr;
9500 newinet->inet_dport = htons(asoc->pee 9346 newinet->inet_dport = htons(asoc->peer.port);
9501 newinet->pmtudisc = inet->pmtudisc; 9347 newinet->pmtudisc = inet->pmtudisc;
9502 atomic_set(&newinet->inet_id, get_ran !! 9348 newinet->inet_id = prandom_u32();
9503 9349
9504 newinet->uc_ttl = inet->uc_ttl; 9350 newinet->uc_ttl = inet->uc_ttl;
9505 inet_set_bit(MC_LOOP, newsk); !! 9351 newinet->mc_loop = 1;
9506 newinet->mc_ttl = 1; 9352 newinet->mc_ttl = 1;
9507 newinet->mc_index = 0; 9353 newinet->mc_index = 0;
9508 newinet->mc_list = NULL; 9354 newinet->mc_list = NULL;
9509 9355
9510 if (newsk->sk_flags & SK_FLAGS_TIMEST 9356 if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
9511 net_enable_timestamp(); 9357 net_enable_timestamp();
9512 9358
9513 /* Set newsk security attributes from !! 9359 /* Set newsk security attributes from orginal sk and connection
9514 * security attribute from asoc. !! 9360 * security attribute from ep.
9515 */ 9361 */
9516 security_sctp_sk_clone(asoc, sk, news !! 9362 security_sctp_sk_clone(ep, sk, newsk);
9517 } 9363 }
9518 9364
9519 static inline void sctp_copy_descendant(struc 9365 static inline void sctp_copy_descendant(struct sock *sk_to,
9520 const 9366 const struct sock *sk_from)
9521 { 9367 {
9522 size_t ancestor_size = sizeof(struct 9368 size_t ancestor_size = sizeof(struct inet_sock);
9523 9369
9524 ancestor_size += sk_from->sk_prot->ob 9370 ancestor_size += sk_from->sk_prot->obj_size;
9525 ancestor_size -= offsetof(struct sctp 9371 ancestor_size -= offsetof(struct sctp_sock, pd_lobby);
9526 __inet_sk_copy_descendant(sk_to, sk_f 9372 __inet_sk_copy_descendant(sk_to, sk_from, ancestor_size);
9527 } 9373 }
9528 9374
9529 /* Populate the fields of the newsk from the 9375 /* Populate the fields of the newsk from the oldsk and migrate the assoc
9530 * and its messages to the newsk. 9376 * and its messages to the newsk.
9531 */ 9377 */
9532 static int sctp_sock_migrate(struct sock *old 9378 static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
9533 struct sctp_asso 9379 struct sctp_association *assoc,
9534 enum sctp_socket 9380 enum sctp_socket_type type)
9535 { 9381 {
9536 struct sctp_sock *oldsp = sctp_sk(old 9382 struct sctp_sock *oldsp = sctp_sk(oldsk);
9537 struct sctp_sock *newsp = sctp_sk(new 9383 struct sctp_sock *newsp = sctp_sk(newsk);
9538 struct sctp_bind_bucket *pp; /* hash 9384 struct sctp_bind_bucket *pp; /* hash list port iterator */
9539 struct sctp_endpoint *newep = newsp-> 9385 struct sctp_endpoint *newep = newsp->ep;
9540 struct sk_buff *skb, *tmp; 9386 struct sk_buff *skb, *tmp;
9541 struct sctp_ulpevent *event; 9387 struct sctp_ulpevent *event;
9542 struct sctp_bind_hashbucket *head; 9388 struct sctp_bind_hashbucket *head;
9543 int err; 9389 int err;
9544 9390
9545 /* Migrate socket buffer sizes and al 9391 /* Migrate socket buffer sizes and all the socket level options to the
9546 * new socket. 9392 * new socket.
9547 */ 9393 */
9548 newsk->sk_sndbuf = oldsk->sk_sndbuf; 9394 newsk->sk_sndbuf = oldsk->sk_sndbuf;
9549 newsk->sk_rcvbuf = oldsk->sk_rcvbuf; 9395 newsk->sk_rcvbuf = oldsk->sk_rcvbuf;
9550 /* Brute force copy old sctp opt. */ 9396 /* Brute force copy old sctp opt. */
9551 sctp_copy_descendant(newsk, oldsk); 9397 sctp_copy_descendant(newsk, oldsk);
9552 9398
9553 /* Restore the ep value that was over 9399 /* Restore the ep value that was overwritten with the above structure
9554 * copy. 9400 * copy.
9555 */ 9401 */
9556 newsp->ep = newep; 9402 newsp->ep = newep;
9557 newsp->hmac = NULL; 9403 newsp->hmac = NULL;
9558 9404
9559 /* Hook this new socket in to the bin 9405 /* Hook this new socket in to the bind_hash list. */
9560 head = &sctp_port_hashtable[sctp_phas 9406 head = &sctp_port_hashtable[sctp_phashfn(sock_net(oldsk),
9561 9407 inet_sk(oldsk)->inet_num)];
9562 spin_lock_bh(&head->lock); 9408 spin_lock_bh(&head->lock);
9563 pp = sctp_sk(oldsk)->bind_hash; 9409 pp = sctp_sk(oldsk)->bind_hash;
9564 sk_add_bind_node(newsk, &pp->owner); 9410 sk_add_bind_node(newsk, &pp->owner);
9565 sctp_sk(newsk)->bind_hash = pp; 9411 sctp_sk(newsk)->bind_hash = pp;
9566 inet_sk(newsk)->inet_num = inet_sk(ol 9412 inet_sk(newsk)->inet_num = inet_sk(oldsk)->inet_num;
9567 spin_unlock_bh(&head->lock); 9413 spin_unlock_bh(&head->lock);
9568 9414
9569 /* Copy the bind_addr list from the o 9415 /* Copy the bind_addr list from the original endpoint to the new
9570 * endpoint so that we can handle res 9416 * endpoint so that we can handle restarts properly
9571 */ 9417 */
9572 err = sctp_bind_addr_dup(&newsp->ep-> 9418 err = sctp_bind_addr_dup(&newsp->ep->base.bind_addr,
9573 &oldsp->ep-> 9419 &oldsp->ep->base.bind_addr, GFP_KERNEL);
9574 if (err) 9420 if (err)
9575 return err; 9421 return err;
9576 9422
9577 /* New ep's auth_hmacs should be set 9423 /* New ep's auth_hmacs should be set if old ep's is set, in case
9578 * that net->sctp.auth_enable has bee 9424 * that net->sctp.auth_enable has been changed to 0 by users and
9579 * new ep's auth_hmacs couldn't be se 9425 * new ep's auth_hmacs couldn't be set in sctp_endpoint_init().
9580 */ 9426 */
9581 if (oldsp->ep->auth_hmacs) { 9427 if (oldsp->ep->auth_hmacs) {
9582 err = sctp_auth_init_hmacs(ne 9428 err = sctp_auth_init_hmacs(newsp->ep, GFP_KERNEL);
9583 if (err) 9429 if (err)
9584 return err; 9430 return err;
9585 } 9431 }
9586 9432
9587 sctp_auto_asconf_init(newsp); 9433 sctp_auto_asconf_init(newsp);
9588 9434
9589 /* Move any messages in the old socke 9435 /* Move any messages in the old socket's receive queue that are for the
9590 * peeled off association to the new 9436 * peeled off association to the new socket's receive queue.
9591 */ 9437 */
9592 sctp_skb_for_each(skb, &oldsk->sk_rec 9438 sctp_skb_for_each(skb, &oldsk->sk_receive_queue, tmp) {
9593 event = sctp_skb2event(skb); 9439 event = sctp_skb2event(skb);
9594 if (event->asoc == assoc) { 9440 if (event->asoc == assoc) {
9595 __skb_unlink(skb, &ol 9441 __skb_unlink(skb, &oldsk->sk_receive_queue);
9596 __skb_queue_tail(&new 9442 __skb_queue_tail(&newsk->sk_receive_queue, skb);
9597 sctp_skb_set_owner_r_ 9443 sctp_skb_set_owner_r_frag(skb, newsk);
9598 } 9444 }
9599 } 9445 }
9600 9446
9601 /* Clean up any messages pending deli 9447 /* Clean up any messages pending delivery due to partial
9602 * delivery. Three cases: 9448 * delivery. Three cases:
9603 * 1) No partial deliver; no work. 9449 * 1) No partial deliver; no work.
9604 * 2) Peeling off partial delivery; k 9450 * 2) Peeling off partial delivery; keep pd_lobby in new pd_lobby.
9605 * 3) Peeling off non-partial deliver 9451 * 3) Peeling off non-partial delivery; move pd_lobby to receive_queue.
9606 */ 9452 */
9607 atomic_set(&sctp_sk(newsk)->pd_mode, 9453 atomic_set(&sctp_sk(newsk)->pd_mode, assoc->ulpq.pd_mode);
9608 9454
9609 if (atomic_read(&sctp_sk(oldsk)->pd_m 9455 if (atomic_read(&sctp_sk(oldsk)->pd_mode)) {
9610 struct sk_buff_head *queue; 9456 struct sk_buff_head *queue;
9611 9457
9612 /* Decide which queue to move 9458 /* Decide which queue to move pd_lobby skbs to. */
9613 if (assoc->ulpq.pd_mode) { 9459 if (assoc->ulpq.pd_mode) {
9614 queue = &newsp->pd_lo 9460 queue = &newsp->pd_lobby;
9615 } else 9461 } else
9616 queue = &newsk->sk_re 9462 queue = &newsk->sk_receive_queue;
9617 9463
9618 /* Walk through the pd_lobby, 9464 /* Walk through the pd_lobby, looking for skbs that
9619 * need moved to the new sock 9465 * need moved to the new socket.
9620 */ 9466 */
9621 sctp_skb_for_each(skb, &oldsp 9467 sctp_skb_for_each(skb, &oldsp->pd_lobby, tmp) {
9622 event = sctp_skb2even 9468 event = sctp_skb2event(skb);
9623 if (event->asoc == as 9469 if (event->asoc == assoc) {
9624 __skb_unlink( 9470 __skb_unlink(skb, &oldsp->pd_lobby);
9625 __skb_queue_t 9471 __skb_queue_tail(queue, skb);
9626 sctp_skb_set_ 9472 sctp_skb_set_owner_r_frag(skb, newsk);
9627 } 9473 }
9628 } 9474 }
9629 9475
9630 /* Clear up any skbs waiting 9476 /* Clear up any skbs waiting for the partial
9631 * delivery to finish. 9477 * delivery to finish.
9632 */ 9478 */
9633 if (assoc->ulpq.pd_mode) 9479 if (assoc->ulpq.pd_mode)
9634 sctp_clear_pd(oldsk, 9480 sctp_clear_pd(oldsk, NULL);
9635 9481
9636 } 9482 }
9637 9483
9638 sctp_for_each_rx_skb(assoc, newsk, sc 9484 sctp_for_each_rx_skb(assoc, newsk, sctp_skb_set_owner_r_frag);
9639 9485
9640 /* Set the type of socket to indicate 9486 /* Set the type of socket to indicate that it is peeled off from the
9641 * original UDP-style socket or creat 9487 * original UDP-style socket or created with the accept() call on a
9642 * TCP-style socket.. 9488 * TCP-style socket..
9643 */ 9489 */
9644 newsp->type = type; 9490 newsp->type = type;
9645 9491
9646 /* Mark the new socket "in-use" by th 9492 /* Mark the new socket "in-use" by the user so that any packets
9647 * that may arrive on the association 9493 * that may arrive on the association after we've moved it are
9648 * queued to the backlog. This preve 9494 * queued to the backlog. This prevents a potential race between
9649 * backlog processing on the old sock 9495 * backlog processing on the old socket and new-packet processing
9650 * on the new socket. 9496 * on the new socket.
9651 * 9497 *
9652 * The caller has just allocated news 9498 * The caller has just allocated newsk so we can guarantee that other
9653 * paths won't try to lock it and the 9499 * paths won't try to lock it and then oldsk.
9654 */ 9500 */
9655 lock_sock_nested(newsk, SINGLE_DEPTH_ 9501 lock_sock_nested(newsk, SINGLE_DEPTH_NESTING);
9656 sctp_for_each_tx_datachunk(assoc, tru 9502 sctp_for_each_tx_datachunk(assoc, true, sctp_clear_owner_w);
9657 sctp_assoc_migrate(assoc, newsk); 9503 sctp_assoc_migrate(assoc, newsk);
9658 sctp_for_each_tx_datachunk(assoc, fal 9504 sctp_for_each_tx_datachunk(assoc, false, sctp_set_owner_w);
9659 9505
9660 /* If the association on the newsk is 9506 /* If the association on the newsk is already closed before accept()
9661 * is called, set RCV_SHUTDOWN flag. 9507 * is called, set RCV_SHUTDOWN flag.
9662 */ 9508 */
9663 if (sctp_state(assoc, CLOSED) && sctp 9509 if (sctp_state(assoc, CLOSED) && sctp_style(newsk, TCP)) {
9664 inet_sk_set_state(newsk, SCTP 9510 inet_sk_set_state(newsk, SCTP_SS_CLOSED);
9665 newsk->sk_shutdown |= RCV_SHU 9511 newsk->sk_shutdown |= RCV_SHUTDOWN;
9666 } else { 9512 } else {
9667 inet_sk_set_state(newsk, SCTP 9513 inet_sk_set_state(newsk, SCTP_SS_ESTABLISHED);
9668 } 9514 }
9669 9515
9670 release_sock(newsk); 9516 release_sock(newsk);
9671 9517
9672 return 0; 9518 return 0;
9673 } 9519 }
9674 9520
9675 9521
9676 /* This proto struct describes the ULP interf 9522 /* This proto struct describes the ULP interface for SCTP. */
9677 struct proto sctp_prot = { 9523 struct proto sctp_prot = {
9678 .name = "SCTP", 9524 .name = "SCTP",
9679 .owner = THIS_MODULE, 9525 .owner = THIS_MODULE,
9680 .close = sctp_close, 9526 .close = sctp_close,
9681 .disconnect = sctp_disconnect, 9527 .disconnect = sctp_disconnect,
9682 .accept = sctp_accept, 9528 .accept = sctp_accept,
9683 .ioctl = sctp_ioctl, 9529 .ioctl = sctp_ioctl,
9684 .init = sctp_init_sock, 9530 .init = sctp_init_sock,
9685 .destroy = sctp_destroy_sock, 9531 .destroy = sctp_destroy_sock,
9686 .shutdown = sctp_shutdown, 9532 .shutdown = sctp_shutdown,
9687 .setsockopt = sctp_setsockopt, 9533 .setsockopt = sctp_setsockopt,
9688 .getsockopt = sctp_getsockopt, 9534 .getsockopt = sctp_getsockopt,
9689 .bpf_bypass_getsockopt = sctp_bpf_by <<
9690 .sendmsg = sctp_sendmsg, 9535 .sendmsg = sctp_sendmsg,
9691 .recvmsg = sctp_recvmsg, 9536 .recvmsg = sctp_recvmsg,
9692 .bind = sctp_bind, 9537 .bind = sctp_bind,
9693 .bind_add = sctp_bind_add, <<
9694 .backlog_rcv = sctp_backlog_rcv, 9538 .backlog_rcv = sctp_backlog_rcv,
9695 .hash = sctp_hash, 9539 .hash = sctp_hash,
9696 .unhash = sctp_unhash, 9540 .unhash = sctp_unhash,
9697 .no_autobind = true, 9541 .no_autobind = true,
9698 .obj_size = sizeof(struct sctp_so 9542 .obj_size = sizeof(struct sctp_sock),
9699 .useroffset = offsetof(struct sctp_ 9543 .useroffset = offsetof(struct sctp_sock, subscribe),
9700 .usersize = offsetof(struct sctp_ 9544 .usersize = offsetof(struct sctp_sock, initmsg) -
9701 offsetof(stru 9545 offsetof(struct sctp_sock, subscribe) +
9702 sizeof_field( 9546 sizeof_field(struct sctp_sock, initmsg),
9703 .sysctl_mem = sysctl_sctp_mem, 9547 .sysctl_mem = sysctl_sctp_mem,
9704 .sysctl_rmem = sysctl_sctp_rmem, 9548 .sysctl_rmem = sysctl_sctp_rmem,
9705 .sysctl_wmem = sysctl_sctp_wmem, 9549 .sysctl_wmem = sysctl_sctp_wmem,
9706 .memory_pressure = &sctp_memory_press 9550 .memory_pressure = &sctp_memory_pressure,
9707 .enter_memory_pressure = sctp_enter_m 9551 .enter_memory_pressure = sctp_enter_memory_pressure,
9708 <<
9709 .memory_allocated = &sctp_memory_allo 9552 .memory_allocated = &sctp_memory_allocated,
9710 .per_cpu_fw_alloc = &sctp_memory_per_ <<
9711 <<
9712 .sockets_allocated = &sctp_sockets_al 9553 .sockets_allocated = &sctp_sockets_allocated,
9713 }; 9554 };
9714 9555
9715 #if IS_ENABLED(CONFIG_IPV6) 9556 #if IS_ENABLED(CONFIG_IPV6)
9716 9557
9717 static void sctp_v6_destruct_sock(struct sock 9558 static void sctp_v6_destruct_sock(struct sock *sk)
9718 { 9559 {
9719 sctp_destruct_common(sk); 9560 sctp_destruct_common(sk);
9720 inet6_sock_destruct(sk); 9561 inet6_sock_destruct(sk);
9721 } 9562 }
9722 9563
9723 static int sctp_v6_init_sock(struct sock *sk) 9564 static int sctp_v6_init_sock(struct sock *sk)
9724 { 9565 {
9725 int ret = sctp_init_sock(sk); 9566 int ret = sctp_init_sock(sk);
9726 9567
9727 if (!ret) 9568 if (!ret)
9728 sk->sk_destruct = sctp_v6_des 9569 sk->sk_destruct = sctp_v6_destruct_sock;
9729 9570
9730 return ret; 9571 return ret;
9731 } 9572 }
9732 9573
9733 struct proto sctpv6_prot = { 9574 struct proto sctpv6_prot = {
9734 .name = "SCTPv6", 9575 .name = "SCTPv6",
9735 .owner = THIS_MODULE, 9576 .owner = THIS_MODULE,
9736 .close = sctp_close, 9577 .close = sctp_close,
9737 .disconnect = sctp_disconnect, 9578 .disconnect = sctp_disconnect,
9738 .accept = sctp_accept, 9579 .accept = sctp_accept,
9739 .ioctl = sctp_ioctl, 9580 .ioctl = sctp_ioctl,
9740 .init = sctp_v6_init_sock, 9581 .init = sctp_v6_init_sock,
9741 .destroy = sctp_destroy_sock, 9582 .destroy = sctp_destroy_sock,
9742 .shutdown = sctp_shutdown, 9583 .shutdown = sctp_shutdown,
9743 .setsockopt = sctp_setsockopt, 9584 .setsockopt = sctp_setsockopt,
9744 .getsockopt = sctp_getsockopt, 9585 .getsockopt = sctp_getsockopt,
9745 .bpf_bypass_getsockopt = sctp_bpf_by <<
9746 .sendmsg = sctp_sendmsg, 9586 .sendmsg = sctp_sendmsg,
9747 .recvmsg = sctp_recvmsg, 9587 .recvmsg = sctp_recvmsg,
9748 .bind = sctp_bind, 9588 .bind = sctp_bind,
9749 .bind_add = sctp_bind_add, <<
9750 .backlog_rcv = sctp_backlog_rcv, 9589 .backlog_rcv = sctp_backlog_rcv,
9751 .hash = sctp_hash, 9590 .hash = sctp_hash,
9752 .unhash = sctp_unhash, 9591 .unhash = sctp_unhash,
9753 .no_autobind = true, 9592 .no_autobind = true,
9754 .obj_size = sizeof(struct sctp6 9593 .obj_size = sizeof(struct sctp6_sock),
9755 .ipv6_pinfo_offset = offsetof(struct <<
9756 .useroffset = offsetof(struct sct 9594 .useroffset = offsetof(struct sctp6_sock, sctp.subscribe),
9757 .usersize = offsetof(struct sct 9595 .usersize = offsetof(struct sctp6_sock, sctp.initmsg) -
9758 offsetof(stru 9596 offsetof(struct sctp6_sock, sctp.subscribe) +
9759 sizeof_field( 9597 sizeof_field(struct sctp6_sock, sctp.initmsg),
9760 .sysctl_mem = sysctl_sctp_mem, 9598 .sysctl_mem = sysctl_sctp_mem,
9761 .sysctl_rmem = sysctl_sctp_rmem, 9599 .sysctl_rmem = sysctl_sctp_rmem,
9762 .sysctl_wmem = sysctl_sctp_wmem, 9600 .sysctl_wmem = sysctl_sctp_wmem,
9763 .memory_pressure = &sctp_memory_press 9601 .memory_pressure = &sctp_memory_pressure,
9764 .enter_memory_pressure = sctp_enter_m 9602 .enter_memory_pressure = sctp_enter_memory_pressure,
9765 <<
9766 .memory_allocated = &sctp_memory_allo 9603 .memory_allocated = &sctp_memory_allocated,
9767 .per_cpu_fw_alloc = &sctp_memory_per_ <<
9768 <<
9769 .sockets_allocated = &sctp_sockets_al 9604 .sockets_allocated = &sctp_sockets_allocated,
9770 }; 9605 };
9771 #endif /* IS_ENABLED(CONFIG_IPV6) */ 9606 #endif /* IS_ENABLED(CONFIG_IPV6) */
9772 9607
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.