History

Merge branch 'do-a-single-memdup_user-in-sctp_setsockopt-v2'

Christoph Hellwig says: ==================== do a single memdup_user in sctp_setsockopt v2 here is a resend of my series to lift the copy_from_user out of the individual sctp sockopt handlers into the main sctp_setsockopt routine. Changes since v1: - fixes a few sizeof calls. - use memzero_explicit in sctp_setsockopt_auth_key instead of special casing it for a kzfree in the caller - remove some minor cleanups from sctp_setsockopt_autoclose to keep it closer to the existing version - add another little only vaguely related cleanup patch ====================

David S. Miller committed 6 years ago

Commit bed1ce72 parents 9aa0dfe 6c8983a1 file · +477 −722Browse files

Unified · Split

net/sctp/socket.c+477−722
@@ -979,9 +979,8 @@ int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw) · 978 unmodified lines
979979 *
980980 * Returns 0 if ok, <0 errno code on error.
981981 */
982−static int sctp_setsockopt_bindx_kernel(struct sock *sk,
983− struct sockaddr *addrs, int addrs_size,
984− int op)
982+static int sctp_setsockopt_bindx(struct sock *sk, struct sockaddr *addrs,
983+ int addrs_size, int op)
985984 {
986985 int err;
987986 int addrcnt = 0;
@@ -991,7 +990,7 @@ static int sctp_setsockopt_bindx_kernel(struct sock *sk, · 3 unmodified lines
991990 struct sctp_af *af;
992991
993992 pr_debug("%s: sk:%p addrs:%p addrs_size:%d opt:%d\n",
994− __func__, sk, addrs, addrs_size, op);
993+ __func__, sk, addr_buf, addrs_size, op);
995994
996995 if (unlikely(addrs_size <= 0))
997996 return -EINVAL;
@@ -1037,29 +1036,13 @@ static int sctp_setsockopt_bindx_kernel(struct sock *sk, · 39 unmodified lines
10371036 }
10381037 }
10391038
1040−static int sctp_setsockopt_bindx(struct sock *sk,
1041− struct sockaddr __user *addrs,
1042− int addrs_size, int op)
1043−{
1044− struct sockaddr *kaddrs;
1045− int err;
1046−
1047− kaddrs = memdup_user(addrs, addrs_size);
1048− if (IS_ERR(kaddrs))
1049− return PTR_ERR(kaddrs);
1050− err = sctp_setsockopt_bindx_kernel(sk, kaddrs, addrs_size, op);
1051− kfree(kaddrs);
1052− return err;
1053−}
1054−
10551039 static int sctp_bind_add(struct sock *sk, struct sockaddr *addrs,
10561040 int addrlen)
10571041 {
10581042 int err;
10591043
10601044 lock_sock(sk);
1061− err = sctp_setsockopt_bindx_kernel(sk, addrs, addrlen,
1062− SCTP_BINDX_ADD_ADDR);
1045+ err = sctp_setsockopt_bindx(sk, addrs, addrlen, SCTP_BINDX_ADD_ADDR);
10631046 release_sock(sk);
10641047 return err;
10651048 }
@@ -1303,36 +1286,29 @@ out_free: · 237 unmodified lines
13031286 * it.
13041287 *
13051288 * sk The sk of the socket
1306− * addrs The pointer to the addresses in user land
1289+ * addrs The pointer to the addresses
13071290 * addrssize Size of the addrs buffer
13081291 *
13091292 * Returns >=0 if ok, <0 errno code on error.
13101293 */
1311−static int __sctp_setsockopt_connectx(struct sock *sk,
1312− struct sockaddr __user *addrs,
1313− int addrs_size,
1314− sctp_assoc_t *assoc_id)
1294+static int __sctp_setsockopt_connectx(struct sock *sk, struct sockaddr *kaddrs,
1295+ int addrs_size, sctp_assoc_t *assoc_id)
13151296 {
1316− struct sockaddr *kaddrs;
13171297 int err = 0, flags = 0;
13181298
13191299 pr_debug("%s: sk:%p addrs:%p addrs_size:%d\n",
1320− __func__, sk, addrs, addrs_size);
1300+ __func__, sk, kaddrs, addrs_size);
13211301
13221302 /* make sure the 1st addr's sa_family is accessible later */
13231303 if (unlikely(addrs_size < sizeof(sa_family_t)))
13241304 return -EINVAL;
13251305
1326− kaddrs = memdup_user(addrs, addrs_size);
1327− if (IS_ERR(kaddrs))
1328− return PTR_ERR(kaddrs);
1329−
13301306 /* Allow security module to validate connectx addresses. */
13311307 err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_CONNECTX,
13321308 (struct sockaddr *)kaddrs,
13331309 addrs_size);
13341310 if (err)
1335− goto out_free;
1311+ return err;
13361312
13371313 /* in-kernel sockets don't generally have a file allocated to them
13381314 * if all they do is call sock_create_kern().
@@ -1340,12 +1316,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk, · 1 unmodified line
13401316 if (sk->sk_socket->file)
13411317 flags = sk->sk_socket->file->f_flags;
13421318
1343− err = __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
1344−
1345−out_free:
1346− kfree(kaddrs);
1347−
1348− return err;
1319+ return __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
13491320 }
13501321
13511322 /*
@@ -1353,10 +1324,10 @@ out_free: · 1 unmodified line
13531324 * to the option that doesn't provide association id.
13541325 */
13551326 static int sctp_setsockopt_connectx_old(struct sock *sk,
1356− struct sockaddr __user *addrs,
1327+ struct sockaddr *kaddrs,
13571328 int addrs_size)
13581329 {
1359− return __sctp_setsockopt_connectx(sk, addrs, addrs_size, NULL);
1330+ return __sctp_setsockopt_connectx(sk, kaddrs, addrs_size, NULL);
13601331 }
13611332
13621333 /*
@@ -1366,13 +1337,13 @@ static int sctp_setsockopt_connectx_old(struct sock *sk, · 3 unmodified lines
13661337 * always positive.
13671338 */
13681339 static int sctp_setsockopt_connectx(struct sock *sk,
1369− struct sockaddr __user *addrs,
1340+ struct sockaddr *kaddrs,
13701341 int addrs_size)
13711342 {
13721343 sctp_assoc_t assoc_id = 0;
13731344 int err = 0;
13741345
1375− err = __sctp_setsockopt_connectx(sk, addrs, addrs_size, &assoc_id);
1346+ err = __sctp_setsockopt_connectx(sk, kaddrs, addrs_size, &assoc_id);
13761347
13771348 if (err)
13781349 return err;
@@ -1402,6 +1373,7 @@ static int sctp_getsockopt_connectx3(struct sock *sk, int len, · 23 unmodified lines
14021373 {
14031374 struct sctp_getaddrs_old param;
14041375 sctp_assoc_t assoc_id = 0;
1376+ struct sockaddr *kaddrs;
14051377 int err = 0;
14061378
14071379 #ifdef CONFIG_COMPAT
@@ -1425,9 +1397,12 @@ static int sctp_getsockopt_connectx3(struct sock *sk, int len, · 17 unmodified lines
14251397 return -EFAULT;
14261398 }
14271399
1428− err = __sctp_setsockopt_connectx(sk, (struct sockaddr __user *)
1429− param.addrs, param.addr_num,
1430− &assoc_id);
1400+ kaddrs = memdup_user(param.addrs, param.addr_num);
1401+ if (IS_ERR(kaddrs))
1402+ return PTR_ERR(kaddrs);
1403+
1404+ err = __sctp_setsockopt_connectx(sk, kaddrs, param.addr_num, &assoc_id);
1405+ kfree(kaddrs);
14311406 if (err == 0 || err == -EINPROGRESS) {
14321407 if (copy_to_user(optval, &assoc_id, sizeof(assoc_id)))
14331408 return -EFAULT;
@@ -2209,28 +2184,18 @@ out: · 775 unmodified lines
22092184 * exceeds the current PMTU size, the message will NOT be sent and
22102185 * instead a error will be indicated to the user.
22112186 */
2212−static int sctp_setsockopt_disable_fragments(struct sock *sk,
2213− char __user *optval,
2187+static int sctp_setsockopt_disable_fragments(struct sock *sk, int *val,
22142188 unsigned int optlen)
22152189 {
2216− int val;
2217−
22182190 if (optlen < sizeof(int))
22192191 return -EINVAL;
2220−
2221− if (get_user(val, (int __user *)optval))
2222− return -EFAULT;
2223−
2224− sctp_sk(sk)->disable_fragments = (val == 0) ? 0 : 1;
2225−
2192+ sctp_sk(sk)->disable_fragments = (*val == 0) ? 0 : 1;
22262193 return 0;
22272194 }
22282195
2229−static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
2196+static int sctp_setsockopt_events(struct sock *sk, __u8 *sn_type,
22302197 unsigned int optlen)
22312198 {
2232− struct sctp_event_subscribe subscribe;
2233− __u8 *sn_type = (__u8 *)&subscribe;
22342199 struct sctp_sock *sp = sctp_sk(sk);
22352200 struct sctp_association *asoc;
22362201 int i;
@@ -2238,9 +2203,6 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, · 1 unmodified line
22382203 if (optlen > sizeof(struct sctp_event_subscribe))
22392204 return -EINVAL;
22402205
2241− if (copy_from_user(&subscribe, optval, optlen))
2242− return -EFAULT;
2243−
22442206 for (i = 0; i < optlen; i++)
22452207 sctp_ulpevent_type_set(&sp->subscribe, SCTP_SN_TYPE_BASE + i,
22462208 sn_type[i]);
@@ -2280,7 +2242,7 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, · 33 unmodified lines
22802242 * integer defining the number of seconds of idle time before an
22812243 * association is closed.
22822244 */
2283−static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
2245+static int sctp_setsockopt_autoclose(struct sock *sk, u32 *optval,
22842246 unsigned int optlen)
22852247 {
22862248 struct sctp_sock *sp = sctp_sk(sk);
@@ -2291,9 +2253,8 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval, · 4 unmodified lines
22912253 return -EOPNOTSUPP;
22922254 if (optlen != sizeof(int))
22932255 return -EINVAL;
2294− if (copy_from_user(&sp->autoclose, optval, optlen))
2295− return -EFAULT;
22962256
2257+ sp->autoclose = *optval;
22972258 if (sp->autoclose > net->sctp.max_autoclose)
22982259 sp->autoclose = net->sctp.max_autoclose;
22992260
@@ -2628,48 +2589,42 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, · 328 unmodified lines
26282589 }
26292590
26302591 static int sctp_setsockopt_peer_addr_params(struct sock *sk,
2631− char __user *optval,
2592+ struct sctp_paddrparams *params,
26322593 unsigned int optlen)
26332594 {
2634− struct sctp_paddrparams params;
26352595 struct sctp_transport *trans = NULL;
26362596 struct sctp_association *asoc = NULL;
26372597 struct sctp_sock *sp = sctp_sk(sk);
26382598 int error;
26392599 int hb_change, pmtud_change, sackdelay_change;
26402600
2641− if (optlen == sizeof(params)) {
2642− if (copy_from_user(&params, optval, optlen))
2643− return -EFAULT;
2644− } else if (optlen == ALIGN(offsetof(struct sctp_paddrparams,
2601+ if (optlen == ALIGN(offsetof(struct sctp_paddrparams,
26452602 spp_ipv6_flowlabel), 4)) {
2646− if (copy_from_user(&params, optval, optlen))
2647− return -EFAULT;
2648− if (params.spp_flags & (SPP_DSCP | SPP_IPV6_FLOWLABEL))
2603+ if (params->spp_flags & (SPP_DSCP | SPP_IPV6_FLOWLABEL))
26492604 return -EINVAL;
2650− } else {
2605+ } else if (optlen != sizeof(*params)) {
26512606 return -EINVAL;
26522607 }
26532608
26542609 /* Validate flags and value parameters. */
2655− hb_change = params.spp_flags & SPP_HB;
2656− pmtud_change = params.spp_flags & SPP_PMTUD;
2657− sackdelay_change = params.spp_flags & SPP_SACKDELAY;
2610+ hb_change = params->spp_flags & SPP_HB;
2611+ pmtud_change = params->spp_flags & SPP_PMTUD;
2612+ sackdelay_change = params->spp_flags & SPP_SACKDELAY;
26582613
26592614 if (hb_change == SPP_HB ||
26602615 pmtud_change == SPP_PMTUD ||
26612616 sackdelay_change == SPP_SACKDELAY ||
2662− params.spp_sackdelay > 500 ||
2663− (params.spp_pathmtu &&
2664− params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
2617+ params->spp_sackdelay > 500 ||
2618+ (params->spp_pathmtu &&
2619+ params->spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
26652620 return -EINVAL;
26662621
26672622 /* If an address other than INADDR_ANY is specified, and
26682623 * no transport is found, then the request is invalid.
26692624 */
2670− if (!sctp_is_any(sk, (union sctp_addr *)&params.spp_address)) {
2671− trans = sctp_addr_id2transport(sk, &params.spp_address,
2672− params.spp_assoc_id);
2625+ if (!sctp_is_any(sk, (union sctp_addr *)&params->spp_address)) {
2626+ trans = sctp_addr_id2transport(sk, &params->spp_address,
2627+ params->spp_assoc_id);
26732628 if (!trans)
26742629 return -EINVAL;
26752630 }
@@ -2678,19 +2633,19 @@ static int sctp_setsockopt_peer_addr_params(struct sock *sk, · 2 unmodified lines
26782633 * socket is a one to many style socket, and an association
26792634 * was not found, then the id was invalid.
26802635 */
2681− asoc = sctp_id2assoc(sk, params.spp_assoc_id);
2682− if (!asoc && params.spp_assoc_id != SCTP_FUTURE_ASSOC &&
2636+ asoc = sctp_id2assoc(sk, params->spp_assoc_id);
2637+ if (!asoc && params->spp_assoc_id != SCTP_FUTURE_ASSOC &&
26832638 sctp_style(sk, UDP))
26842639 return -EINVAL;
26852640
26862641 /* Heartbeat demand can only be sent on a transport or
26872642 * association, but not a socket.
26882643 */
2689− if (params.spp_flags & SPP_HB_DEMAND && !trans && !asoc)
2644+ if (params->spp_flags & SPP_HB_DEMAND && !trans && !asoc)
26902645 return -EINVAL;
26912646
26922647 /* Process parameters. */
2693− error = sctp_apply_peer_addr_params(&params, trans, asoc, sp,
2648+ error = sctp_apply_peer_addr_params(params, trans, asoc, sp,
26942649 hb_change, pmtud_change,
26952650 sackdelay_change);
26962651
@@ -2703,7 +2658,7 @@ static int sctp_setsockopt_peer_addr_params(struct sock *sk, · 6 unmodified lines
27032658 if (!trans && asoc) {
27042659 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
27052660 transports) {
2706− sctp_apply_peer_addr_params(&params, trans, asoc, sp,
2661+ sctp_apply_peer_addr_params(params, trans, asoc, sp,
27072662 hb_change, pmtud_change,
27082663 sackdelay_change);
27092664 }
@@ -2796,17 +2751,14 @@ static void sctp_apply_asoc_delayed_ack(struct sctp_sack_info *params, · 86 unmodified lines
27962751 */
27972752
27982753 static int sctp_setsockopt_delayed_ack(struct sock *sk,
2799− char __user *optval, unsigned int optlen)
2754+ struct sctp_sack_info *params,
2755+ unsigned int optlen)
28002756 {
28012757 struct sctp_sock *sp = sctp_sk(sk);
28022758 struct sctp_association *asoc;
2803− struct sctp_sack_info params;
28042759
28052760 if (optlen == sizeof(struct sctp_sack_info)) {
2806− if (copy_from_user(&params, optval, optlen))
2807− return -EFAULT;
2808−
2809− if (params.sack_delay == 0 && params.sack_freq == 0)
2761+ if (params->sack_delay == 0 && params->sack_freq == 0)
28102762 return 0;
28112763 } else if (optlen == sizeof(struct sctp_assoc_value)) {
28122764 pr_warn_ratelimited(DEPRECATED
@@ -2814,59 +2766,57 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, · 1 unmodified line
28142766 "Use of struct sctp_assoc_value in delayed_ack socket option.\n"
28152767 "Use struct sctp_sack_info instead\n",
28162768 current->comm, task_pid_nr(current));
2817− if (copy_from_user(&params, optval, optlen))
2818− return -EFAULT;
28192769
2820− if (params.sack_delay == 0)
2821− params.sack_freq = 1;
2770+ if (params->sack_delay == 0)
2771+ params->sack_freq = 1;
28222772 else
2823− params.sack_freq = 0;
2773+ params->sack_freq = 0;
28242774 } else
28252775 return -EINVAL;
28262776
28272777 /* Validate value parameter. */
2828− if (params.sack_delay > 500)
2778+ if (params->sack_delay > 500)
28292779 return -EINVAL;
28302780
28312781 /* Get association, if sack_assoc_id != SCTP_FUTURE_ASSOC and the
28322782 * socket is a one to many style socket, and an association
28332783 * was not found, then the id was invalid.
28342784 */
2835− asoc = sctp_id2assoc(sk, params.sack_assoc_id);
2836− if (!asoc && params.sack_assoc_id > SCTP_ALL_ASSOC &&
2785+ asoc = sctp_id2assoc(sk, params->sack_assoc_id);
2786+ if (!asoc && params->sack_assoc_id > SCTP_ALL_ASSOC &&
28372787 sctp_style(sk, UDP))
28382788 return -EINVAL;
28392789
28402790 if (asoc) {
2841− sctp_apply_asoc_delayed_ack(&params, asoc);
2791+ sctp_apply_asoc_delayed_ack(params, asoc);
28422792
28432793 return 0;
28442794 }
28452795
28462796 if (sctp_style(sk, TCP))
2847− params.sack_assoc_id = SCTP_FUTURE_ASSOC;
2797+ params->sack_assoc_id = SCTP_FUTURE_ASSOC;
28482798
2849− if (params.sack_assoc_id == SCTP_FUTURE_ASSOC ||
2850− params.sack_assoc_id == SCTP_ALL_ASSOC) {
2851− if (params.sack_delay) {
2852− sp->sackdelay = params.sack_delay;
2799+ if (params->sack_assoc_id == SCTP_FUTURE_ASSOC ||
2800+ params->sack_assoc_id == SCTP_ALL_ASSOC) {
2801+ if (params->sack_delay) {
2802+ sp->sackdelay = params->sack_delay;
28532803 sp->param_flags =
28542804 sctp_spp_sackdelay_enable(sp->param_flags);
28552805 }
2856− if (params.sack_freq == 1) {
2806+ if (params->sack_freq == 1) {
28572807 sp->param_flags =
28582808 sctp_spp_sackdelay_disable(sp->param_flags);
2859− } else if (params.sack_freq > 1) {
2860− sp->sackfreq = params.sack_freq;
2809+ } else if (params->sack_freq > 1) {
2810+ sp->sackfreq = params->sack_freq;
28612811 sp->param_flags =
28622812 sctp_spp_sackdelay_enable(sp->param_flags);
28632813 }
28642814 }
28652815
2866− if (params.sack_assoc_id == SCTP_CURRENT_ASSOC ||
2867− params.sack_assoc_id == SCTP_ALL_ASSOC)
2816+ if (params->sack_assoc_id == SCTP_CURRENT_ASSOC ||
2817+ params->sack_assoc_id == SCTP_ALL_ASSOC)
28682818 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
2869− sctp_apply_asoc_delayed_ack(&params, asoc);
2819+ sctp_apply_asoc_delayed_ack(params, asoc);
28702820
28712821 return 0;
28722822 }
@@ -2882,24 +2832,22 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, · 9 unmodified lines
28822832 * by the change). With TCP-style sockets, this option is inherited by
28832833 * sockets derived from a listener socket.
28842834 */
2885−static int sctp_setsockopt_initmsg(struct sock *sk, char __user *optval, unsigned int optlen)
2835+static int sctp_setsockopt_initmsg(struct sock *sk, struct sctp_initmsg *sinit,
2836+ unsigned int optlen)
28862837 {
2887− struct sctp_initmsg sinit;
28882838 struct sctp_sock *sp = sctp_sk(sk);
28892839
28902840 if (optlen != sizeof(struct sctp_initmsg))
28912841 return -EINVAL;
2892− if (copy_from_user(&sinit, optval, optlen))
2893− return -EFAULT;
28942842
2895− if (sinit.sinit_num_ostreams)
2896− sp->initmsg.sinit_num_ostreams = sinit.sinit_num_ostreams;
2897− if (sinit.sinit_max_instreams)
2898− sp->initmsg.sinit_max_instreams = sinit.sinit_max_instreams;
2899− if (sinit.sinit_max_attempts)
2900− sp->initmsg.sinit_max_attempts = sinit.sinit_max_attempts;
2901− if (sinit.sinit_max_init_timeo)
2902− sp->initmsg.sinit_max_init_timeo = sinit.sinit_max_init_timeo;
2843+ if (sinit->sinit_num_ostreams)
2844+ sp->initmsg.sinit_num_ostreams = sinit->sinit_num_ostreams;
2845+ if (sinit->sinit_max_instreams)
2846+ sp->initmsg.sinit_max_instreams = sinit->sinit_max_instreams;
2847+ if (sinit->sinit_max_attempts)
2848+ sp->initmsg.sinit_max_attempts = sinit->sinit_max_attempts;
2849+ if (sinit->sinit_max_init_timeo)
2850+ sp->initmsg.sinit_max_init_timeo = sinit->sinit_max_init_timeo;
29032851
29042852 return 0;
29052853 }
@@ -2919,57 +2867,54 @@ static int sctp_setsockopt_initmsg(struct sock *sk, char __user *optval, unsigne · 13 unmodified lines
29192867 * to this call if the caller is using the UDP model.
29202868 */
29212869 static int sctp_setsockopt_default_send_param(struct sock *sk,
2922− char __user *optval,
2870+ struct sctp_sndrcvinfo *info,
29232871 unsigned int optlen)
29242872 {
29252873 struct sctp_sock *sp = sctp_sk(sk);
29262874 struct sctp_association *asoc;
2927− struct sctp_sndrcvinfo info;
29282875
2929− if (optlen != sizeof(info))
2876+ if (optlen != sizeof(*info))
29302877 return -EINVAL;
2931− if (copy_from_user(&info, optval, optlen))
2932− return -EFAULT;
2933− if (info.sinfo_flags &
2878+ if (info->sinfo_flags &
29342879 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
29352880 SCTP_ABORT | SCTP_EOF))
29362881 return -EINVAL;
29372882
2938− asoc = sctp_id2assoc(sk, info.sinfo_assoc_id);
2939− if (!asoc && info.sinfo_assoc_id > SCTP_ALL_ASSOC &&
2883+ asoc = sctp_id2assoc(sk, info->sinfo_assoc_id);
2884+ if (!asoc && info->sinfo_assoc_id > SCTP_ALL_ASSOC &&
29402885 sctp_style(sk, UDP))
29412886 return -EINVAL;
29422887
29432888 if (asoc) {
2944− asoc->default_stream = info.sinfo_stream;
2945− asoc->default_flags = info.sinfo_flags;
2946− asoc->default_ppid = info.sinfo_ppid;
2947− asoc->default_context = info.sinfo_context;
2948− asoc->default_timetolive = info.sinfo_timetolive;
2889+ asoc->default_stream = info->sinfo_stream;
2890+ asoc->default_flags = info->sinfo_flags;
2891+ asoc->default_ppid = info->sinfo_ppid;
2892+ asoc->default_context = info->sinfo_context;
2893+ asoc->default_timetolive = info->sinfo_timetolive;
29492894
29502895 return 0;
29512896 }
29522897
29532898 if (sctp_style(sk, TCP))
2954− info.sinfo_assoc_id = SCTP_FUTURE_ASSOC;
2899+ info->sinfo_assoc_id = SCTP_FUTURE_ASSOC;
29552900
2956− if (info.sinfo_assoc_id == SCTP_FUTURE_ASSOC ||
2957− info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2958− sp->default_stream = info.sinfo_stream;
2959− sp->default_flags = info.sinfo_flags;
2960− sp->default_ppid = info.sinfo_ppid;
2961− sp->default_context = info.sinfo_context;
2962− sp->default_timetolive = info.sinfo_timetolive;
2901+ if (info->sinfo_assoc_id == SCTP_FUTURE_ASSOC ||
2902+ info->sinfo_assoc_id == SCTP_ALL_ASSOC) {
2903+ sp->default_stream = info->sinfo_stream;
2904+ sp->default_flags = info->sinfo_flags;
2905+ sp->default_ppid = info->sinfo_ppid;
2906+ sp->default_context = info->sinfo_context;
2907+ sp->default_timetolive = info->sinfo_timetolive;
29632908 }
29642909
2965− if (info.sinfo_assoc_id == SCTP_CURRENT_ASSOC ||
2966− info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
2910+ if (info->sinfo_assoc_id == SCTP_CURRENT_ASSOC ||
2911+ info->sinfo_assoc_id == SCTP_ALL_ASSOC) {
29672912 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
2968− asoc->default_stream = info.sinfo_stream;
2969− asoc->default_flags = info.sinfo_flags;
2970− asoc->default_ppid = info.sinfo_ppid;
2971− asoc->default_context = info.sinfo_context;
2972− asoc->default_timetolive = info.sinfo_timetolive;
2913+ asoc->default_stream = info->sinfo_stream;
2914+ asoc->default_flags = info->sinfo_flags;
2915+ asoc->default_ppid = info->sinfo_ppid;
2916+ asoc->default_context = info->sinfo_context;
2917+ asoc->default_timetolive = info->sinfo_timetolive;
29732918 }
29742919 }
29752920
@@ -2980,54 +2925,51 @@ static int sctp_setsockopt_default_send_param(struct sock *sk, · 4 unmodified lines
29802925 * (SCTP_DEFAULT_SNDINFO)
29812926 */
29822927 static int sctp_setsockopt_default_sndinfo(struct sock *sk,
2983− char __user *optval,
2928+ struct sctp_sndinfo *info,
29842929 unsigned int optlen)
29852930 {
29862931 struct sctp_sock *sp = sctp_sk(sk);
29872932 struct sctp_association *asoc;
2988− struct sctp_sndinfo info;
29892933
2990− if (optlen != sizeof(info))
2934+ if (optlen != sizeof(*info))
29912935 return -EINVAL;
2992− if (copy_from_user(&info, optval, optlen))
2993− return -EFAULT;
2994− if (info.snd_flags &
2936+ if (info->snd_flags &
29952937 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
29962938 SCTP_ABORT | SCTP_EOF))
29972939 return -EINVAL;
29982940
2999− asoc = sctp_id2assoc(sk, info.snd_assoc_id);
3000− if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC &&
2941+ asoc = sctp_id2assoc(sk, info->snd_assoc_id);
2942+ if (!asoc && info->snd_assoc_id > SCTP_ALL_ASSOC &&
30012943 sctp_style(sk, UDP))
30022944 return -EINVAL;
30032945
30042946 if (asoc) {
3005− asoc->default_stream = info.snd_sid;
3006− asoc->default_flags = info.snd_flags;
3007− asoc->default_ppid = info.snd_ppid;
3008− asoc->default_context = info.snd_context;
2947+ asoc->default_stream = info->snd_sid;
2948+ asoc->default_flags = info->snd_flags;
2949+ asoc->default_ppid = info->snd_ppid;
2950+ asoc->default_context = info->snd_context;
30092951
30102952 return 0;
30112953 }
30122954
30132955 if (sctp_style(sk, TCP))
3014− info.snd_assoc_id = SCTP_FUTURE_ASSOC;
2956+ info->snd_assoc_id = SCTP_FUTURE_ASSOC;
30152957
3016− if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||
3017− info.snd_assoc_id == SCTP_ALL_ASSOC) {
3018− sp->default_stream = info.snd_sid;
3019− sp->default_flags = info.snd_flags;
3020− sp->default_ppid = info.snd_ppid;
3021− sp->default_context = info.snd_context;
2958+ if (info->snd_assoc_id == SCTP_FUTURE_ASSOC ||
2959+ info->snd_assoc_id == SCTP_ALL_ASSOC) {
2960+ sp->default_stream = info->snd_sid;
2961+ sp->default_flags = info->snd_flags;
2962+ sp->default_ppid = info->snd_ppid;
2963+ sp->default_context = info->snd_context;
30222964 }
30232965
3024− if (info.snd_assoc_id == SCTP_CURRENT_ASSOC ||
3025− info.snd_assoc_id == SCTP_ALL_ASSOC) {
2966+ if (info->snd_assoc_id == SCTP_CURRENT_ASSOC ||
2967+ info->snd_assoc_id == SCTP_ALL_ASSOC) {
30262968 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
3027− asoc->default_stream = info.snd_sid;
3028− asoc->default_flags = info.snd_flags;
3029− asoc->default_ppid = info.snd_ppid;
3030− asoc->default_context = info.snd_context;
2969+ asoc->default_stream = info->snd_sid;
2970+ asoc->default_flags = info->snd_flags;
2971+ asoc->default_ppid = info->snd_ppid;
2972+ asoc->default_context = info->snd_context;
30312973 }
30322974 }
30332975
@@ -3040,10 +2982,9 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk, · 6 unmodified lines
30402982 * the association primary. The enclosed address must be one of the
30412983 * association peer's addresses.
30422984 */
3043−static int sctp_setsockopt_primary_addr(struct sock *sk, char __user *optval,
2985+static int sctp_setsockopt_primary_addr(struct sock *sk, struct sctp_prim *prim,
30442986 unsigned int optlen)
30452987 {
3046− struct sctp_prim prim;
30472988 struct sctp_transport *trans;
30482989 struct sctp_af *af;
30492990 int err;
@@ -3051,21 +2992,18 @@ static int sctp_setsockopt_primary_addr(struct sock *sk, char __user *optval, · 1 unmodified line
30512992 if (optlen != sizeof(struct sctp_prim))
30522993 return -EINVAL;
30532994
3054− if (copy_from_user(&prim, optval, sizeof(struct sctp_prim)))
3055− return -EFAULT;
3056−
30572995 /* Allow security module to validate address but need address len. */
3058− af = sctp_get_af_specific(prim.ssp_addr.ss_family);
2996+ af = sctp_get_af_specific(prim->ssp_addr.ss_family);
30592997 if (!af)
30602998 return -EINVAL;
30612999
30623000 err = security_sctp_bind_connect(sk, SCTP_PRIMARY_ADDR,
3063− (struct sockaddr *)&prim.ssp_addr,
3001+ (struct sockaddr *)&prim->ssp_addr,
30643002 af->sockaddr_len);
30653003 if (err)
30663004 return err;
30673005
3068− trans = sctp_addr_id2transport(sk, &prim.ssp_addr, prim.ssp_assoc_id);
3006+ trans = sctp_addr_id2transport(sk, &prim->ssp_addr, prim->ssp_assoc_id);
30693007 if (!trans)
30703008 return -EINVAL;
30713009
@@ -3082,17 +3020,12 @@ static int sctp_setsockopt_primary_addr(struct sock *sk, char __user *optval, · 10 unmodified lines
30823020 * introduced, at the cost of more packets in the network. Expects an
30833021 * integer boolean flag.
30843022 */
3085−static int sctp_setsockopt_nodelay(struct sock *sk, char __user *optval,
3023+static int sctp_setsockopt_nodelay(struct sock *sk, int *val,
30863024 unsigned int optlen)
30873025 {
3088− int val;
3089−
30903026 if (optlen < sizeof(int))
30913027 return -EINVAL;
3092− if (get_user(val, (int __user *)optval))
3093− return -EFAULT;
3094−
3095− sctp_sk(sk)->nodelay = (val == 0) ? 0 : 1;
3028+ sctp_sk(sk)->nodelay = (*val == 0) ? 0 : 1;
30963029 return 0;
30973030 }
30983031
@@ -3108,9 +3041,10 @@ static int sctp_setsockopt_nodelay(struct sock *sk, char __user *optval, · 9 unmodified lines
31083041 * be changed.
31093042 *
31103043 */
3111−static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigned int optlen)
3044+static int sctp_setsockopt_rtoinfo(struct sock *sk,
3045+ struct sctp_rtoinfo *rtoinfo,
3046+ unsigned int optlen)
31123047 {
3113− struct sctp_rtoinfo rtoinfo;
31143048 struct sctp_association *asoc;
31153049 unsigned long rto_min, rto_max;
31163050 struct sctp_sock *sp = sctp_sk(sk);
@@ -3118,18 +3052,15 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigne · 1 unmodified line
31183052 if (optlen != sizeof (struct sctp_rtoinfo))
31193053 return -EINVAL;
31203054
3121− if (copy_from_user(&rtoinfo, optval, optlen))
3122− return -EFAULT;
3123−
3124− asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
3055+ asoc = sctp_id2assoc(sk, rtoinfo->srto_assoc_id);
31253056
31263057 /* Set the values to the specific association */
3127− if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
3058+ if (!asoc && rtoinfo->srto_assoc_id != SCTP_FUTURE_ASSOC &&
31283059 sctp_style(sk, UDP))
31293060 return -EINVAL;
31303061
3131− rto_max = rtoinfo.srto_max;
3132− rto_min = rtoinfo.srto_min;
3062+ rto_max = rtoinfo->srto_max;
3063+ rto_min = rtoinfo->srto_min;
31333064
31343065 if (rto_max)
31353066 rto_max = asoc ? msecs_to_jiffies(rto_max) : rto_max;
@@ -3145,17 +3076,17 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigne · 9 unmodified lines
31453076 return -EINVAL;
31463077
31473078 if (asoc) {
3148− if (rtoinfo.srto_initial != 0)
3079+ if (rtoinfo->srto_initial != 0)
31493080 asoc->rto_initial =
3150− msecs_to_jiffies(rtoinfo.srto_initial);
3081+ msecs_to_jiffies(rtoinfo->srto_initial);
31513082 asoc->rto_max = rto_max;
31523083 asoc->rto_min = rto_min;
31533084 } else {
31543085 /* If there is no association or the association-id = 0
31553086 * set the values to the endpoint.
31563087 */
3157− if (rtoinfo.srto_initial != 0)
3158− sp->rtoinfo.srto_initial = rtoinfo.srto_initial;
3088+ if (rtoinfo->srto_initial != 0)
3089+ sp->rtoinfo.srto_initial = rtoinfo->srto_initial;
31593090 sp->rtoinfo.srto_max = rto_max;
31603091 sp->rtoinfo.srto_min = rto_min;
31613092 }
@@ -3174,26 +3105,25 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigne · 12 unmodified lines
31743105 * See [SCTP] for more information.
31753106 *
31763107 */
3177−static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, unsigned int optlen)
3108+static int sctp_setsockopt_associnfo(struct sock *sk,
3109+ struct sctp_assocparams *assocparams,
3110+ unsigned int optlen)
31783111 {
31793112
3180− struct sctp_assocparams assocparams;
31813113 struct sctp_association *asoc;
31823114
31833115 if (optlen != sizeof(struct sctp_assocparams))
31843116 return -EINVAL;
3185− if (copy_from_user(&assocparams, optval, optlen))
3186− return -EFAULT;
31873117
3188− asoc = sctp_id2assoc(sk, assocparams.sasoc_assoc_id);
3118+ asoc = sctp_id2assoc(sk, assocparams->sasoc_assoc_id);
31893119
3190− if (!asoc && assocparams.sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
3120+ if (!asoc && assocparams->sasoc_assoc_id != SCTP_FUTURE_ASSOC &&
31913121 sctp_style(sk, UDP))
31923122 return -EINVAL;
31933123
31943124 /* Set the values to the specific association */
31953125 if (asoc) {
3196− if (assocparams.sasoc_asocmaxrxt != 0) {
3126+ if (assocparams->sasoc_asocmaxrxt != 0) {
31973127 __u32 path_sum = 0;
31983128 int paths = 0;
31993129 struct sctp_transport *peer_addr;
@@ -3210,24 +3140,25 @@ static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, unsig · 10 unmodified lines
32103140 * then one path.
32113141 */
32123142 if (paths > 1 &&
3213− assocparams.sasoc_asocmaxrxt > path_sum)
3143+ assocparams->sasoc_asocmaxrxt > path_sum)
32143144 return -EINVAL;
32153145
3216− asoc->max_retrans = assocparams.sasoc_asocmaxrxt;
3146+ asoc->max_retrans = assocparams->sasoc_asocmaxrxt;
32173147 }
32183148
3219− if (assocparams.sasoc_cookie_life != 0)
3220− asoc->cookie_life = ms_to_ktime(assocparams.sasoc_cookie_life);
3149+ if (assocparams->sasoc_cookie_life != 0)
3150+ asoc->cookie_life =
3151+ ms_to_ktime(assocparams->sasoc_cookie_life);
32213152 } else {
32223153 /* Set the values to the endpoint */
32233154 struct sctp_sock *sp = sctp_sk(sk);
32243155
3225− if (assocparams.sasoc_asocmaxrxt != 0)
3156+ if (assocparams->sasoc_asocmaxrxt != 0)
32263157 sp->assocparams.sasoc_asocmaxrxt =
3227− assocparams.sasoc_asocmaxrxt;
3228− if (assocparams.sasoc_cookie_life != 0)
3158+ assocparams->sasoc_asocmaxrxt;
3159+ if (assocparams->sasoc_cookie_life != 0)
32293160 sp->assocparams.sasoc_cookie_life =
3230− assocparams.sasoc_cookie_life;
3161+ assocparams->sasoc_cookie_life;
32313162 }
32323163 return 0;
32333164 }
@@ -3242,16 +3173,14 @@ static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, unsig · 8 unmodified lines
32423173 * addresses and a user will receive both PF_INET6 and PF_INET type
32433174 * addresses on the socket.
32443175 */
3245−static int sctp_setsockopt_mappedv4(struct sock *sk, char __user *optval, unsigned int optlen)
3176+static int sctp_setsockopt_mappedv4(struct sock *sk, int *val,
3177+ unsigned int optlen)
32463178 {
3247− int val;
32483179 struct sctp_sock *sp = sctp_sk(sk);
32493180
32503181 if (optlen < sizeof(int))
32513182 return -EINVAL;
3252− if (get_user(val, (int __user *)optval))
3253− return -EFAULT;
3254− if (val)
3183+ if (*val)
32553184 sp->v4mapped = 1;
32563185 else
32573186 sp->v4mapped = 0;
@@ -3286,11 +3215,13 @@ static int sctp_setsockopt_mappedv4(struct sock *sk, char __user *optval, unsign · 28 unmodified lines
32863215 * changed (effecting future associations only).
32873216 * assoc_value: This parameter specifies the maximum size in bytes.
32883217 */
3289−static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned int optlen)
3218+static int sctp_setsockopt_maxseg(struct sock *sk,
3219+ struct sctp_assoc_value *params,
3220+ unsigned int optlen)
32903221 {
32913222 struct sctp_sock *sp = sctp_sk(sk);
3292− struct sctp_assoc_value params;
32933223 struct sctp_association *asoc;
3224+ sctp_assoc_t assoc_id;
32943225 int val;
32953226
32963227 if (optlen == sizeof(int)) {
@@ -3299,19 +3230,17 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned · 2 unmodified lines
32993230 "Use of int in maxseg socket option.\n"
33003231 "Use struct sctp_assoc_value instead\n",
33013232 current->comm, task_pid_nr(current));
3302− if (copy_from_user(&val, optval, optlen))
3303− return -EFAULT;
3304− params.assoc_id = SCTP_FUTURE_ASSOC;
3233+ assoc_id = SCTP_FUTURE_ASSOC;
3234+ val = *(int *)params;
33053235 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3306− if (copy_from_user(&params, optval, optlen))
3307− return -EFAULT;
3308− val = params.assoc_value;
3236+ assoc_id = params->assoc_id;
3237+ val = params->assoc_value;
33093238 } else {
33103239 return -EINVAL;
33113240 }
33123241
3313− asoc = sctp_id2assoc(sk, params.assoc_id);
3314− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3242+ asoc = sctp_id2assoc(sk, assoc_id);
3243+ if (!asoc && assoc_id != SCTP_FUTURE_ASSOC &&
33153244 sctp_style(sk, UDP))
33163245 return -EINVAL;
33173246
@@ -3346,12 +3275,12 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned · 28 unmodified lines
33463275 * locally bound addresses. The following structure is used to make a
33473276 * set primary request:
33483277 */
3349−static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optval,
3278+static int sctp_setsockopt_peer_primary_addr(struct sock *sk,
3279+ struct sctp_setpeerprim *prim,
33503280 unsigned int optlen)
33513281 {
33523282 struct sctp_sock *sp;
33533283 struct sctp_association *asoc = NULL;
3354− struct sctp_setpeerprim prim;
33553284 struct sctp_chunk *chunk;
33563285 struct sctp_af *af;
33573286 int err;
@@ -3364,10 +3293,7 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva · 6 unmodified lines
33643293 if (optlen != sizeof(struct sctp_setpeerprim))
33653294 return -EINVAL;
33663295
3367− if (copy_from_user(&prim, optval, optlen))
3368− return -EFAULT;
3369−
3370− asoc = sctp_id2assoc(sk, prim.sspp_assoc_id);
3296+ asoc = sctp_id2assoc(sk, prim->sspp_assoc_id);
33713297 if (!asoc)
33723298 return -EINVAL;
33733299
@@ -3380,26 +3306,26 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva · 6 unmodified lines
33803306 if (!sctp_state(asoc, ESTABLISHED))
33813307 return -ENOTCONN;
33823308
3383− af = sctp_get_af_specific(prim.sspp_addr.ss_family);
3309+ af = sctp_get_af_specific(prim->sspp_addr.ss_family);
33843310 if (!af)
33853311 return -EINVAL;
33863312
3387− if (!af->addr_valid((union sctp_addr *)&prim.sspp_addr, sp, NULL))
3313+ if (!af->addr_valid((union sctp_addr *)&prim->sspp_addr, sp, NULL))
33883314 return -EADDRNOTAVAIL;
33893315
3390− if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim.sspp_addr))
3316+ if (!sctp_assoc_lookup_laddr(asoc, (union sctp_addr *)&prim->sspp_addr))
33913317 return -EADDRNOTAVAIL;
33923318
33933319 /* Allow security module to validate address. */
33943320 err = security_sctp_bind_connect(sk, SCTP_SET_PEER_PRIMARY_ADDR,
3395− (struct sockaddr *)&prim.sspp_addr,
3321+ (struct sockaddr *)&prim->sspp_addr,
33963322 af->sockaddr_len);
33973323 if (err)
33983324 return err;
33993325
34003326 /* Create an ASCONF chunk with SET_PRIMARY parameter */
34013327 chunk = sctp_make_asconf_set_prim(asoc,
3402− (union sctp_addr *)&prim.sspp_addr);
3328+ (union sctp_addr *)&prim->sspp_addr);
34033329 if (!chunk)
34043330 return -ENOMEM;
34053331
@@ -3410,17 +3336,14 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva · 4 unmodified lines
34103336 return err;
34113337 }
34123338
3413−static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval,
3339+static int sctp_setsockopt_adaptation_layer(struct sock *sk,
3340+ struct sctp_setadaptation *adapt,
34143341 unsigned int optlen)
34153342 {
3416− struct sctp_setadaptation adaptation;
3417−
34183343 if (optlen != sizeof(struct sctp_setadaptation))
34193344 return -EINVAL;
3420− if (copy_from_user(&adaptation, optval, optlen))
3421− return -EFAULT;
34223345
3423− sctp_sk(sk)->adaptation_ind = adaptation.ssb_adaptation_ind;
3346+ sctp_sk(sk)->adaptation_ind = adapt->ssb_adaptation_ind;
34243347
34253348 return 0;
34263349 }
@@ -3439,40 +3362,38 @@ static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval · 12 unmodified lines
34393362 * received messages from the peer and does not effect the value that is
34403363 * saved with outbound messages.
34413364 */
3442−static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
3365+static int sctp_setsockopt_context(struct sock *sk,
3366+ struct sctp_assoc_value *params,
34433367 unsigned int optlen)
34443368 {
34453369 struct sctp_sock *sp = sctp_sk(sk);
3446− struct sctp_assoc_value params;
34473370 struct sctp_association *asoc;
34483371
34493372 if (optlen != sizeof(struct sctp_assoc_value))
34503373 return -EINVAL;
3451− if (copy_from_user(&params, optval, optlen))
3452− return -EFAULT;
34533374
3454− asoc = sctp_id2assoc(sk, params.assoc_id);
3455− if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
3375+ asoc = sctp_id2assoc(sk, params->assoc_id);
3376+ if (!asoc && params->assoc_id > SCTP_ALL_ASSOC &&
34563377 sctp_style(sk, UDP))
34573378 return -EINVAL;
34583379
34593380 if (asoc) {
3460− asoc->default_rcv_context = params.assoc_value;
3381+ asoc->default_rcv_context = params->assoc_value;
34613382
34623383 return 0;
34633384 }
34643385
34653386 if (sctp_style(sk, TCP))
3466− params.assoc_id = SCTP_FUTURE_ASSOC;
3387+ params->assoc_id = SCTP_FUTURE_ASSOC;
34673388
3468− if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3469− params.assoc_id == SCTP_ALL_ASSOC)
3470− sp->default_rcv_context = params.assoc_value;
3389+ if (params->assoc_id == SCTP_FUTURE_ASSOC ||
3390+ params->assoc_id == SCTP_ALL_ASSOC)
3391+ sp->default_rcv_context = params->assoc_value;
34713392
3472− if (params.assoc_id == SCTP_CURRENT_ASSOC ||
3473− params.assoc_id == SCTP_ALL_ASSOC)
3393+ if (params->assoc_id == SCTP_CURRENT_ASSOC ||
3394+ params->assoc_id == SCTP_ALL_ASSOC)
34743395 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3475− asoc->default_rcv_context = params.assoc_value;
3396+ asoc->default_rcv_context = params->assoc_value;
34763397
34773398 return 0;
34783399 }
@@ -3501,18 +3422,13 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval, · 22 unmodified lines
35013422 * application using the one to many model may become confused and act
35023423 * incorrectly.
35033424 */
3504−static int sctp_setsockopt_fragment_interleave(struct sock *sk,
3505− char __user *optval,
3425+static int sctp_setsockopt_fragment_interleave(struct sock *sk, int *val,
35063426 unsigned int optlen)
35073427 {
3508− int val;
3509−
35103428 if (optlen != sizeof(int))
35113429 return -EINVAL;
3512− if (get_user(val, (int __user *)optval))
3513− return -EFAULT;
35143430
3515− sctp_sk(sk)->frag_interleave = !!val;
3431+ sctp_sk(sk)->frag_interleave = !!*val;
35163432
35173433 if (!sctp_sk(sk)->frag_interleave)
35183434 sctp_sk(sk)->ep->intl_enable = 0;
@@ -3537,24 +3453,19 @@ static int sctp_setsockopt_fragment_interleave(struct sock *sk, · 18 unmodified lines
35373453 * call as long as the user provided buffer is large enough to hold the
35383454 * message.
35393455 */
3540−static int sctp_setsockopt_partial_delivery_point(struct sock *sk,
3541− char __user *optval,
3456+static int sctp_setsockopt_partial_delivery_point(struct sock *sk, u32 *val,
35423457 unsigned int optlen)
35433458 {
3544− u32 val;
3545−
35463459 if (optlen != sizeof(u32))
35473460 return -EINVAL;
3548− if (get_user(val, (int __user *)optval))
3549− return -EFAULT;
35503461
35513462 /* Note: We double the receive buffer from what the user sets
35523463 * it to be, also initial rwnd is based on rcvbuf/2.
35533464 */
3554− if (val > (sk->sk_rcvbuf >> 1))
3465+ if (*val > (sk->sk_rcvbuf >> 1))
35553466 return -EINVAL;
35563467
3557− sctp_sk(sk)->pd_point = val;
3468+ sctp_sk(sk)->pd_point = *val;
35583469
35593470 return 0; /* is this the right error code? */
35603471 }
@@ -3571,12 +3482,13 @@ static int sctp_setsockopt_partial_delivery_point(struct sock *sk, · 10 unmodified lines
35713482 * future associations inheriting the socket value.
35723483 */
35733484 static int sctp_setsockopt_maxburst(struct sock *sk,
3574− char __user *optval,
3485+ struct sctp_assoc_value *params,
35753486 unsigned int optlen)
35763487 {
35773488 struct sctp_sock *sp = sctp_sk(sk);
3578− struct sctp_assoc_value params;
35793489 struct sctp_association *asoc;
3490+ sctp_assoc_t assoc_id;
3491+ u32 assoc_value;
35803492
35813493 if (optlen == sizeof(int)) {
35823494 pr_warn_ratelimited(DEPRECATED
@@ -3584,37 +3496,33 @@ static int sctp_setsockopt_maxburst(struct sock *sk, · 1 unmodified line
35843496 "Use of int in max_burst socket option deprecated.\n"
35853497 "Use struct sctp_assoc_value instead\n",
35863498 current->comm, task_pid_nr(current));
3587− if (copy_from_user(&params.assoc_value, optval, optlen))
3588− return -EFAULT;
3589− params.assoc_id = SCTP_FUTURE_ASSOC;
3499+ assoc_id = SCTP_FUTURE_ASSOC;
3500+ assoc_value = *((int *)params);
35903501 } else if (optlen == sizeof(struct sctp_assoc_value)) {
3591− if (copy_from_user(&params, optval, optlen))
3592− return -EFAULT;
3502+ assoc_id = params->assoc_id;
3503+ assoc_value = params->assoc_value;
35933504 } else
35943505 return -EINVAL;
35953506
3596− asoc = sctp_id2assoc(sk, params.assoc_id);
3597− if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
3598− sctp_style(sk, UDP))
3507+ asoc = sctp_id2assoc(sk, assoc_id);
3508+ if (!asoc && assoc_id > SCTP_ALL_ASSOC && sctp_style(sk, UDP))
35993509 return -EINVAL;
36003510
36013511 if (asoc) {
3602− asoc->max_burst = params.assoc_value;
3512+ asoc->max_burst = assoc_value;
36033513
36043514 return 0;
36053515 }
36063516
36073517 if (sctp_style(sk, TCP))
3608− params.assoc_id = SCTP_FUTURE_ASSOC;
3518+ assoc_id = SCTP_FUTURE_ASSOC;
36093519
3610− if (params.assoc_id == SCTP_FUTURE_ASSOC ||
3611− params.assoc_id == SCTP_ALL_ASSOC)
3612− sp->max_burst = params.assoc_value;
3520+ if (assoc_id == SCTP_FUTURE_ASSOC || assoc_id == SCTP_ALL_ASSOC)
3521+ sp->max_burst = assoc_value;
36133522
3614− if (params.assoc_id == SCTP_CURRENT_ASSOC ||
3615− params.assoc_id == SCTP_ALL_ASSOC)
3523+ if (assoc_id == SCTP_CURRENT_ASSOC || assoc_id == SCTP_ALL_ASSOC)
36163524 list_for_each_entry(asoc, &sp->ep->asocs, asocs)
3617− asoc->max_burst = params.assoc_value;
3525+ asoc->max_burst = assoc_value;
36183526
36193527 return 0;
36203528 }
@@ -3627,21 +3535,18 @@ static int sctp_setsockopt_maxburst(struct sock *sk, · 6 unmodified lines
36273535 * will only effect future associations on the socket.
36283536 */
36293537 static int sctp_setsockopt_auth_chunk(struct sock *sk,
3630− char __user *optval,
3538+ struct sctp_authchunk *val,
36313539 unsigned int optlen)
36323540 {
36333541 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3634− struct sctp_authchunk val;
36353542
36363543 if (!ep->auth_enable)
36373544 return -EACCES;
36383545
36393546 if (optlen != sizeof(struct sctp_authchunk))
36403547 return -EINVAL;
3641− if (copy_from_user(&val, optval, optlen))
3642− return -EFAULT;
36433548
3644− switch (val.sauth_chunk) {
3549+ switch (val->sauth_chunk) {
36453550 case SCTP_CID_INIT:
36463551 case SCTP_CID_INIT_ACK:
36473552 case SCTP_CID_SHUTDOWN_COMPLETE:
@@ -3650,7 +3555,7 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk, · 2 unmodified lines
36503555 }
36513556
36523557 /* add this chunk id to the endpoint */
3653− return sctp_auth_ep_add_chunkid(ep, val.sauth_chunk);
3558+ return sctp_auth_ep_add_chunkid(ep, val->sauth_chunk);
36543559 }
36553560
36563561 /*
@@ -3660,13 +3565,11 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk, · 3 unmodified lines
36603565 * endpoint requires the peer to use.
36613566 */
36623567 static int sctp_setsockopt_hmac_ident(struct sock *sk,
3663− char __user *optval,
3568+ struct sctp_hmacalgo *hmacs,
36643569 unsigned int optlen)
36653570 {
36663571 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3667− struct sctp_hmacalgo *hmacs;
36683572 u32 idents;
3669− int err;
36703573
36713574 if (!ep->auth_enable)
36723575 return -EACCES;
@@ -3676,21 +3579,12 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk, · 3 unmodified lines
36763579 optlen = min_t(unsigned int, optlen, sizeof(struct sctp_hmacalgo) +
36773580 SCTP_AUTH_NUM_HMACS * sizeof(u16));
36783581
3679− hmacs = memdup_user(optval, optlen);
3680− if (IS_ERR(hmacs))
3681− return PTR_ERR(hmacs);
3682−
36833582 idents = hmacs->shmac_num_idents;
36843583 if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
3685− (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) {
3686− err = -EINVAL;
3687− goto out;
3688− }
3584+ (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo)))
3585+ return -EINVAL;
36893586
3690− err = sctp_auth_ep_set_hmacs(ep, hmacs);
3691−out:
3692− kfree(hmacs);
3693− return err;
3587+ return sctp_auth_ep_set_hmacs(ep, hmacs);
36943588 }
36953589
36963590 /*
@@ -3700,11 +3594,10 @@ out: · 3 unmodified lines
37003594 * association shared key.
37013595 */
37023596 static int sctp_setsockopt_auth_key(struct sock *sk,
3703− char __user *optval,
3597+ struct sctp_authkey *authkey,
37043598 unsigned int optlen)
37053599 {
37063600 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
3707− struct sctp_authkey *authkey;
37083601 struct sctp_association *asoc;
37093602 int ret = -EINVAL;
37103603
@@ -3715,10 +3608,6 @@ static int sctp_setsockopt_auth_key(struct sock *sk, · 4 unmodified lines
37153608 */
37163609 optlen = min_t(unsigned int, optlen, USHRT_MAX + sizeof(*authkey));
37173610
3718− authkey = memdup_user(optval, optlen);
3719− if (IS_ERR(authkey))
3720− return PTR_ERR(authkey);
3721−
37223611 if (authkey->sca_keylength > optlen - sizeof(*authkey))
37233612 goto out;
37243613
@@ -3755,7 +3644,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk, · 30 unmodified lines
37553644 }
37563645
37573646 out:
3758− kzfree(authkey);
3647+ memzero_explicit(authkey, optlen);
37593648 return ret;
37603649 }
37613650
@@ -3766,42 +3655,39 @@ out: · 4 unmodified lines
37663655 * the association shared key.
37673656 */
37683657 static int sctp_setsockopt_active_key(struct sock *sk,
3769− char __user *optval,
3658+ struct sctp_authkeyid *val,
37703659 unsigned int optlen)
37713660 {
37723661 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
37733662 struct sctp_association *asoc;
3774− struct sctp_authkeyid val;
37753663 int ret = 0;
37763664
37773665 if (optlen != sizeof(struct sctp_authkeyid))
37783666 return -EINVAL;
3779− if (copy_from_user(&val, optval, optlen))
3780− return -EFAULT;
37813667
3782− asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3783− if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3668+ asoc = sctp_id2assoc(sk, val->scact_assoc_id);
3669+ if (!asoc && val->scact_assoc_id > SCTP_ALL_ASSOC &&
37843670 sctp_style(sk, UDP))
37853671 return -EINVAL;
37863672
37873673 if (asoc)
3788− return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3674+ return sctp_auth_set_active_key(ep, asoc, val->scact_keynumber);
37893675
37903676 if (sctp_style(sk, TCP))
3791− val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3677+ val->scact_assoc_id = SCTP_FUTURE_ASSOC;
37923678
3793− if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3794− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3795− ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
3679+ if (val->scact_assoc_id == SCTP_FUTURE_ASSOC ||
3680+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
3681+ ret = sctp_auth_set_active_key(ep, asoc, val->scact_keynumber);
37963682 if (ret)
37973683 return ret;
37983684 }
37993685
3800− if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3801− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3686+ if (val->scact_assoc_id == SCTP_CURRENT_ASSOC ||
3687+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
38023688 list_for_each_entry(asoc, &ep->asocs, asocs) {
38033689 int res = sctp_auth_set_active_key(ep, asoc,
3804− val.scact_keynumber);
3690+ val->scact_keynumber);
38053691
38063692 if (res && !ret)
38073693 ret = res;
@@ -3817,42 +3703,39 @@ static int sctp_setsockopt_active_key(struct sock *sk, · 9 unmodified lines
38173703 * This set option will delete a shared secret key from use.
38183704 */
38193705 static int sctp_setsockopt_del_key(struct sock *sk,
3820− char __user *optval,
3706+ struct sctp_authkeyid *val,
38213707 unsigned int optlen)
38223708 {
38233709 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
38243710 struct sctp_association *asoc;
3825− struct sctp_authkeyid val;
38263711 int ret = 0;
38273712
38283713 if (optlen != sizeof(struct sctp_authkeyid))
38293714 return -EINVAL;
3830− if (copy_from_user(&val, optval, optlen))
3831− return -EFAULT;
38323715
3833− asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3834− if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3716+ asoc = sctp_id2assoc(sk, val->scact_assoc_id);
3717+ if (!asoc && val->scact_assoc_id > SCTP_ALL_ASSOC &&
38353718 sctp_style(sk, UDP))
38363719 return -EINVAL;
38373720
38383721 if (asoc)
3839− return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3722+ return sctp_auth_del_key_id(ep, asoc, val->scact_keynumber);
38403723
38413724 if (sctp_style(sk, TCP))
3842− val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3725+ val->scact_assoc_id = SCTP_FUTURE_ASSOC;
38433726
3844− if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3845− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3846− ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
3727+ if (val->scact_assoc_id == SCTP_FUTURE_ASSOC ||
3728+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
3729+ ret = sctp_auth_del_key_id(ep, asoc, val->scact_keynumber);
38473730 if (ret)
38483731 return ret;
38493732 }
38503733
3851− if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3852− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3734+ if (val->scact_assoc_id == SCTP_CURRENT_ASSOC ||
3735+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
38533736 list_for_each_entry(asoc, &ep->asocs, asocs) {
38543737 int res = sctp_auth_del_key_id(ep, asoc,
3855− val.scact_keynumber);
3738+ val->scact_keynumber);
38563739
38573740 if (res && !ret)
38583741 ret = res;
@@ -3867,42 +3750,40 @@ static int sctp_setsockopt_del_key(struct sock *sk, · 8 unmodified lines
38673750 *
38683751 * This set option will deactivate a shared secret key.
38693752 */
3870−static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval,
3753+static int sctp_setsockopt_deactivate_key(struct sock *sk,
3754+ struct sctp_authkeyid *val,
38713755 unsigned int optlen)
38723756 {
38733757 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
38743758 struct sctp_association *asoc;
3875− struct sctp_authkeyid val;
38763759 int ret = 0;
38773760
38783761 if (optlen != sizeof(struct sctp_authkeyid))
38793762 return -EINVAL;
3880− if (copy_from_user(&val, optval, optlen))
3881− return -EFAULT;
38823763
3883− asoc = sctp_id2assoc(sk, val.scact_assoc_id);
3884− if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC &&
3764+ asoc = sctp_id2assoc(sk, val->scact_assoc_id);
3765+ if (!asoc && val->scact_assoc_id > SCTP_ALL_ASSOC &&
38853766 sctp_style(sk, UDP))
38863767 return -EINVAL;
38873768
38883769 if (asoc)
3889− return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3770+ return sctp_auth_deact_key_id(ep, asoc, val->scact_keynumber);
38903771
38913772 if (sctp_style(sk, TCP))
3892− val.scact_assoc_id = SCTP_FUTURE_ASSOC;
3773+ val->scact_assoc_id = SCTP_FUTURE_ASSOC;
38933774
3894− if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
3895− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3896− ret = sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
3775+ if (val->scact_assoc_id == SCTP_FUTURE_ASSOC ||
3776+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
3777+ ret = sctp_auth_deact_key_id(ep, asoc, val->scact_keynumber);
38973778 if (ret)
38983779 return ret;
38993780 }
39003781
3901− if (val.scact_assoc_id == SCTP_CURRENT_ASSOC ||
3902− val.scact_assoc_id == SCTP_ALL_ASSOC) {
3782+ if (val->scact_assoc_id == SCTP_CURRENT_ASSOC ||
3783+ val->scact_assoc_id == SCTP_ALL_ASSOC) {
39033784 list_for_each_entry(asoc, &ep->asocs, asocs) {
39043785 int res = sctp_auth_deact_key_id(ep, asoc,
3905− val.scact_keynumber);
3786+ val->scact_keynumber);
39063787
39073788 if (res && !ret)
39083789 ret = res;
@@ -3926,26 +3807,23 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval, · 17 unmodified lines
39263807 * Note. In this implementation, socket operation overrides default parameter
39273808 * being set by sysctl as well as FreeBSD implementation
39283809 */
3929−static int sctp_setsockopt_auto_asconf(struct sock *sk, char __user *optval,
3810+static int sctp_setsockopt_auto_asconf(struct sock *sk, int *val,
39303811 unsigned int optlen)
39313812 {
3932− int val;
39333813 struct sctp_sock *sp = sctp_sk(sk);
39343814
39353815 if (optlen < sizeof(int))
39363816 return -EINVAL;
3937− if (get_user(val, (int __user *)optval))
3938− return -EFAULT;
3939− if (!sctp_is_ep_boundall(sk) && val)
3817+ if (!sctp_is_ep_boundall(sk) && *val)
39403818 return -EINVAL;
3941− if ((val && sp->do_auto_asconf) || (!val && !sp->do_auto_asconf))
3819+ if ((*val && sp->do_auto_asconf) || (!*val && !sp->do_auto_asconf))
39423820 return 0;
39433821
39443822 spin_lock_bh(&sock_net(sk)->sctp.addr_wq_lock);
3945− if (val == 0 && sp->do_auto_asconf) {
3823+ if (*val == 0 && sp->do_auto_asconf) {
39463824 list_del(&sp->auto_asconf_list);
39473825 sp->do_auto_asconf = 0;
3948− } else if (val && !sp->do_auto_asconf) {
3826+ } else if (*val && !sp->do_auto_asconf) {
39493827 list_add_tail(&sp->auto_asconf_list,
39503828 &sock_net(sk)->sctp.auto_asconf_splist);
39513829 sp->do_auto_asconf = 1;
@@ -3962,176 +3840,154 @@ static int sctp_setsockopt_auto_asconf(struct sock *sk, char __user *optval, · 10 unmodified lines
39623840 * http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
39633841 */
39643842 static int sctp_setsockopt_paddr_thresholds(struct sock *sk,
3965− char __user *optval,
3843+ struct sctp_paddrthlds_v2 *val,
39663844 unsigned int optlen, bool v2)
39673845 {
3968− struct sctp_paddrthlds_v2 val;
39693846 struct sctp_transport *trans;
39703847 struct sctp_association *asoc;
39713848 int len;
39723849
3973− len = v2 ? sizeof(val) : sizeof(struct sctp_paddrthlds);
3850+ len = v2 ? sizeof(*val) : sizeof(struct sctp_paddrthlds);
39743851 if (optlen < len)
39753852 return -EINVAL;
3976− if (copy_from_user(&val, optval, len))
3977− return -EFAULT;
39783853
3979− if (v2 && val.spt_pathpfthld > val.spt_pathcpthld)
3854+ if (v2 && val->spt_pathpfthld > val->spt_pathcpthld)
39803855 return -EINVAL;
39813856
3982− if (!sctp_is_any(sk, (const union sctp_addr *)&val.spt_address)) {
3983− trans = sctp_addr_id2transport(sk, &val.spt_address,
3984− val.spt_assoc_id);
3857+ if (!sctp_is_any(sk, (const union sctp_addr *)&val->spt_address)) {
3858+ trans = sctp_addr_id2transport(sk, &val->spt_address,
3859+ val->spt_assoc_id);
39853860 if (!trans)
39863861 return -ENOENT;
39873862
3988− if (val.spt_pathmaxrxt)
3989− trans->pathmaxrxt = val.spt_pathmaxrxt;
3863+ if (val->spt_pathmaxrxt)
3864+ trans->pathmaxrxt = val->spt_pathmaxrxt;
39903865 if (v2)
3991− trans->ps_retrans = val.spt_pathcpthld;
3992− trans->pf_retrans = val.spt_pathpfthld;
3866+ trans->ps_retrans = val->spt_pathcpthld;
3867+ trans->pf_retrans = val->spt_pathpfthld;
39933868
39943869 return 0;
39953870 }
39963871
3997− asoc = sctp_id2assoc(sk, val.spt_assoc_id);
3998− if (!asoc && val.spt_assoc_id != SCTP_FUTURE_ASSOC &&
3872+ asoc = sctp_id2assoc(sk, val->spt_assoc_id);
3873+ if (!asoc && val->spt_assoc_id != SCTP_FUTURE_ASSOC &&
39993874 sctp_style(sk, UDP))
40003875 return -EINVAL;
40013876
40023877 if (asoc) {
40033878 list_for_each_entry(trans, &asoc->peer.transport_addr_list,
40043879 transports) {
4005− if (val.spt_pathmaxrxt)
4006− trans->pathmaxrxt = val.spt_pathmaxrxt;
3880+ if (val->spt_pathmaxrxt)
3881+ trans->pathmaxrxt = val->spt_pathmaxrxt;
40073882 if (v2)
4008− trans->ps_retrans = val.spt_pathcpthld;
4009− trans->pf_retrans = val.spt_pathpfthld;
3883+ trans->ps_retrans = val->spt_pathcpthld;
3884+ trans->pf_retrans = val->spt_pathpfthld;
40103885 }
40113886
4012− if (val.spt_pathmaxrxt)
4013− asoc->pathmaxrxt = val.spt_pathmaxrxt;
3887+ if (val->spt_pathmaxrxt)
3888+ asoc->pathmaxrxt = val->spt_pathmaxrxt;
40143889 if (v2)
4015− asoc->ps_retrans = val.spt_pathcpthld;
4016− asoc->pf_retrans = val.spt_pathpfthld;
3890+ asoc->ps_retrans = val->spt_pathcpthld;
3891+ asoc->pf_retrans = val->spt_pathpfthld;
40173892 } else {
40183893 struct sctp_sock *sp = sctp_sk(sk);
40193894
4020− if (val.spt_pathmaxrxt)
4021− sp->pathmaxrxt = val.spt_pathmaxrxt;
3895+ if (val->spt_pathmaxrxt)
3896+ sp->pathmaxrxt = val->spt_pathmaxrxt;
40223897 if (v2)
4023− sp->ps_retrans = val.spt_pathcpthld;
4024− sp->pf_retrans = val.spt_pathpfthld;
3898+ sp->ps_retrans = val->spt_pathcpthld;
3899+ sp->pf_retrans = val->spt_pathpfthld;
40253900 }
40263901
40273902 return 0;
40283903 }
40293904
4030−static int sctp_setsockopt_recvrcvinfo(struct sock *sk,
4031− char __user *optval,
3905+static int sctp_setsockopt_recvrcvinfo(struct sock *sk, int *val,
40323906 unsigned int optlen)
40333907 {
4034− int val;
4035−
40363908 if (optlen < sizeof(int))
40373909 return -EINVAL;
4038− if (get_user(val, (int __user *) optval))
4039− return -EFAULT;
40403910
4041− sctp_sk(sk)->recvrcvinfo = (val == 0) ? 0 : 1;
3911+ sctp_sk(sk)->recvrcvinfo = (*val == 0) ? 0 : 1;
40423912
40433913 return 0;
40443914 }
40453915
4046−static int sctp_setsockopt_recvnxtinfo(struct sock *sk,
4047− char __user *optval,
3916+static int sctp_setsockopt_recvnxtinfo(struct sock *sk, int *val,
40483917 unsigned int optlen)
40493918 {
4050− int val;
4051−
40523919 if (optlen < sizeof(int))
40533920 return -EINVAL;
4054− if (get_user(val, (int __user *) optval))
4055− return -EFAULT;
40563921
4057− sctp_sk(sk)->recvnxtinfo = (val == 0) ? 0 : 1;
3922+ sctp_sk(sk)->recvnxtinfo = (*val == 0) ? 0 : 1;
40583923
40593924 return 0;
40603925 }
40613926
40623927 static int sctp_setsockopt_pr_supported(struct sock *sk,
4063− char __user *optval,
3928+ struct sctp_assoc_value *params,
40643929 unsigned int optlen)
40653930 {
4066− struct sctp_assoc_value params;
40673931 struct sctp_association *asoc;
40683932
4069− if (optlen != sizeof(params))
3933+ if (optlen != sizeof(*params))
40703934 return -EINVAL;
40713935
4072− if (copy_from_user(&params, optval, optlen))
4073− return -EFAULT;
4074−
4075− asoc = sctp_id2assoc(sk, params.assoc_id);
4076− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
3936+ asoc = sctp_id2assoc(sk, params->assoc_id);
3937+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
40773938 sctp_style(sk, UDP))
40783939 return -EINVAL;
40793940
4080− sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value;
3941+ sctp_sk(sk)->ep->prsctp_enable = !!params->assoc_value;
40813942
40823943 return 0;
40833944 }
40843945
40853946 static int sctp_setsockopt_default_prinfo(struct sock *sk,
4086− char __user *optval,
3947+ struct sctp_default_prinfo *info,
40873948 unsigned int optlen)
40883949 {
40893950 struct sctp_sock *sp = sctp_sk(sk);
4090− struct sctp_default_prinfo info;
40913951 struct sctp_association *asoc;
40923952 int retval = -EINVAL;
40933953
4094− if (optlen != sizeof(info))
4095− goto out;
4096−
4097− if (copy_from_user(&info, optval, sizeof(info))) {
4098− retval = -EFAULT;
3954+ if (optlen != sizeof(*info))
40993955 goto out;
4100− }
41013956
4102− if (info.pr_policy & ~SCTP_PR_SCTP_MASK)
3957+ if (info->pr_policy & ~SCTP_PR_SCTP_MASK)
41033958 goto out;
41043959
4105− if (info.pr_policy == SCTP_PR_SCTP_NONE)
4106− info.pr_value = 0;
3960+ if (info->pr_policy == SCTP_PR_SCTP_NONE)
3961+ info->pr_value = 0;
41073962
4108− asoc = sctp_id2assoc(sk, info.pr_assoc_id);
4109− if (!asoc && info.pr_assoc_id > SCTP_ALL_ASSOC &&
3963+ asoc = sctp_id2assoc(sk, info->pr_assoc_id);
3964+ if (!asoc && info->pr_assoc_id > SCTP_ALL_ASSOC &&
41103965 sctp_style(sk, UDP))
41113966 goto out;
41123967
41133968 retval = 0;
41143969
41153970 if (asoc) {
4116− SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4117− asoc->default_timetolive = info.pr_value;
3971+ SCTP_PR_SET_POLICY(asoc->default_flags, info->pr_policy);
3972+ asoc->default_timetolive = info->pr_value;
41183973 goto out;
41193974 }
41203975
41213976 if (sctp_style(sk, TCP))
4122− info.pr_assoc_id = SCTP_FUTURE_ASSOC;
3977+ info->pr_assoc_id = SCTP_FUTURE_ASSOC;
41233978
4124− if (info.pr_assoc_id == SCTP_FUTURE_ASSOC ||
4125− info.pr_assoc_id == SCTP_ALL_ASSOC) {
4126− SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy);
4127− sp->default_timetolive = info.pr_value;
3979+ if (info->pr_assoc_id == SCTP_FUTURE_ASSOC ||
3980+ info->pr_assoc_id == SCTP_ALL_ASSOC) {
3981+ SCTP_PR_SET_POLICY(sp->default_flags, info->pr_policy);
3982+ sp->default_timetolive = info->pr_value;
41283983 }
41293984
4130− if (info.pr_assoc_id == SCTP_CURRENT_ASSOC ||
4131− info.pr_assoc_id == SCTP_ALL_ASSOC) {
3985+ if (info->pr_assoc_id == SCTP_CURRENT_ASSOC ||
3986+ info->pr_assoc_id == SCTP_ALL_ASSOC) {
41323987 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4133− SCTP_PR_SET_POLICY(asoc->default_flags, info.pr_policy);
4134− asoc->default_timetolive = info.pr_value;
3988+ SCTP_PR_SET_POLICY(asoc->default_flags,
3989+ info->pr_policy);
3990+ asoc->default_timetolive = info->pr_value;
41353991 }
41363992 }
41373993
@@ -4140,27 +3996,21 @@ out: · 2 unmodified lines
41403996 }
41413997
41423998 static int sctp_setsockopt_reconfig_supported(struct sock *sk,
4143− char __user *optval,
3999+ struct sctp_assoc_value *params,
41444000 unsigned int optlen)
41454001 {
4146− struct sctp_assoc_value params;
41474002 struct sctp_association *asoc;
41484003 int retval = -EINVAL;
41494004
4150− if (optlen != sizeof(params))
4005+ if (optlen != sizeof(*params))
41514006 goto out;
41524007
4153− if (copy_from_user(&params, optval, optlen)) {
4154− retval = -EFAULT;
4155− goto out;
4156− }
4157−
4158− asoc = sctp_id2assoc(sk, params.assoc_id);
4159− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4008+ asoc = sctp_id2assoc(sk, params->assoc_id);
4009+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
41604010 sctp_style(sk, UDP))
41614011 goto out;
41624012
4163− sctp_sk(sk)->ep->reconf_enable = !!params.assoc_value;
4013+ sctp_sk(sk)->ep->reconf_enable = !!params->assoc_value;
41644014
41654015 retval = 0;
41664016
@@ -4169,60 +4019,52 @@ out: · 2 unmodified lines
41694019 }
41704020
41714021 static int sctp_setsockopt_enable_strreset(struct sock *sk,
4172− char __user *optval,
4022+ struct sctp_assoc_value *params,
41734023 unsigned int optlen)
41744024 {
41754025 struct sctp_endpoint *ep = sctp_sk(sk)->ep;
4176− struct sctp_assoc_value params;
41774026 struct sctp_association *asoc;
41784027 int retval = -EINVAL;
41794028
4180− if (optlen != sizeof(params))
4181− goto out;
4182−
4183− if (copy_from_user(&params, optval, optlen)) {
4184− retval = -EFAULT;
4029+ if (optlen != sizeof(*params))
41854030 goto out;
4186− }
41874031
4188− if (params.assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
4032+ if (params->assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
41894033 goto out;
41904034
4191− asoc = sctp_id2assoc(sk, params.assoc_id);
4192− if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4035+ asoc = sctp_id2assoc(sk, params->assoc_id);
4036+ if (!asoc && params->assoc_id > SCTP_ALL_ASSOC &&
41934037 sctp_style(sk, UDP))
41944038 goto out;
41954039
41964040 retval = 0;
41974041
41984042 if (asoc) {
4199− asoc->strreset_enable = params.assoc_value;
4043+ asoc->strreset_enable = params->assoc_value;
42004044 goto out;
42014045 }
42024046
42034047 if (sctp_style(sk, TCP))
4204− params.assoc_id = SCTP_FUTURE_ASSOC;
4048+ params->assoc_id = SCTP_FUTURE_ASSOC;
42054049
4206− if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4207− params.assoc_id == SCTP_ALL_ASSOC)
4208− ep->strreset_enable = params.assoc_value;
4050+ if (params->assoc_id == SCTP_FUTURE_ASSOC ||
4051+ params->assoc_id == SCTP_ALL_ASSOC)
4052+ ep->strreset_enable = params->assoc_value;
42094053
4210− if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4211− params.assoc_id == SCTP_ALL_ASSOC)
4054+ if (params->assoc_id == SCTP_CURRENT_ASSOC ||
4055+ params->assoc_id == SCTP_ALL_ASSOC)
42124056 list_for_each_entry(asoc, &ep->asocs, asocs)
4213− asoc->strreset_enable = params.assoc_value;
4057+ asoc->strreset_enable = params->assoc_value;
42144058
42154059 out:
42164060 return retval;
42174061 }
42184062
42194063 static int sctp_setsockopt_reset_streams(struct sock *sk,
4220− char __user *optval,
4064+ struct sctp_reset_streams *params,
42214065 unsigned int optlen)
42224066 {
4223− struct sctp_reset_streams *params;
42244067 struct sctp_association *asoc;
4225− int retval = -EINVAL;
42264068
42274069 if (optlen < sizeof(*params))
42284070 return -EINVAL;
@@ -4230,116 +4072,82 @@ static int sctp_setsockopt_reset_streams(struct sock *sk, · 1 unmodified line
42304072 optlen = min_t(unsigned int, optlen, USHRT_MAX +
42314073 sizeof(__u16) * sizeof(*params));
42324074
4233− params = memdup_user(optval, optlen);
4234− if (IS_ERR(params))
4235− return PTR_ERR(params);
4236−
42374075 if (params->srs_number_streams * sizeof(__u16) >
42384076 optlen - sizeof(*params))
4239− goto out;
4077+ return -EINVAL;
42404078
42414079 asoc = sctp_id2assoc(sk, params->srs_assoc_id);
42424080 if (!asoc)
4243− goto out;
4244−
4245− retval = sctp_send_reset_streams(asoc, params);
4081+ return -EINVAL;
42464082
4247−out:
4248− kfree(params);
4249− return retval;
4083+ return sctp_send_reset_streams(asoc, params);
42504084 }
42514085
4252−static int sctp_setsockopt_reset_assoc(struct sock *sk,
4253− char __user *optval,
4086+static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd,
42544087 unsigned int optlen)
42554088 {
42564089 struct sctp_association *asoc;
4257− sctp_assoc_t associd;
4258− int retval = -EINVAL;
4259−
4260− if (optlen != sizeof(associd))
4261− goto out;
42624090
4263− if (copy_from_user(&associd, optval, optlen)) {
4264− retval = -EFAULT;
4265− goto out;
4266− }
4091+ if (optlen != sizeof(*associd))
4092+ return -EINVAL;
42674093
4268− asoc = sctp_id2assoc(sk, associd);
4094+ asoc = sctp_id2assoc(sk, *associd);
42694095 if (!asoc)
4270− goto out;
4271−
4272− retval = sctp_send_reset_assoc(asoc);
4096+ return -EINVAL;
42734097
4274−out:
4275− return retval;
4098+ return sctp_send_reset_assoc(asoc);
42764099 }
42774100
42784101 static int sctp_setsockopt_add_streams(struct sock *sk,
4279− char __user *optval,
4102+ struct sctp_add_streams *params,
42804103 unsigned int optlen)
42814104 {
42824105 struct sctp_association *asoc;
4283− struct sctp_add_streams params;
4284− int retval = -EINVAL;
42854106
4286− if (optlen != sizeof(params))
4287− goto out;
4288−
4289− if (copy_from_user(&params, optval, optlen)) {
4290− retval = -EFAULT;
4291− goto out;
4292− }
4107+ if (optlen != sizeof(*params))
4108+ return -EINVAL;
42934109
4294− asoc = sctp_id2assoc(sk, params.sas_assoc_id);
4110+ asoc = sctp_id2assoc(sk, params->sas_assoc_id);
42954111 if (!asoc)
4296− goto out;
4297−
4298− retval = sctp_send_add_streams(asoc, &params);
4112+ return -EINVAL;
42994113
4300−out:
4301− return retval;
4114+ return sctp_send_add_streams(asoc, params);
43024115 }
43034116
43044117 static int sctp_setsockopt_scheduler(struct sock *sk,
4305− char __user *optval,
4118+ struct sctp_assoc_value *params,
43064119 unsigned int optlen)
43074120 {
43084121 struct sctp_sock *sp = sctp_sk(sk);
43094122 struct sctp_association *asoc;
4310− struct sctp_assoc_value params;
43114123 int retval = 0;
43124124
4313− if (optlen < sizeof(params))
4125+ if (optlen < sizeof(*params))
43144126 return -EINVAL;
43154127
4316− optlen = sizeof(params);
4317− if (copy_from_user(&params, optval, optlen))
4318− return -EFAULT;
4319−
4320− if (params.assoc_value > SCTP_SS_MAX)
4128+ if (params->assoc_value > SCTP_SS_MAX)
43214129 return -EINVAL;
43224130
4323− asoc = sctp_id2assoc(sk, params.assoc_id);
4324− if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&
4131+ asoc = sctp_id2assoc(sk, params->assoc_id);
4132+ if (!asoc && params->assoc_id > SCTP_ALL_ASSOC &&
43254133 sctp_style(sk, UDP))
43264134 return -EINVAL;
43274135
43284136 if (asoc)
4329− return sctp_sched_set_sched(asoc, params.assoc_value);
4137+ return sctp_sched_set_sched(asoc, params->assoc_value);
43304138
43314139 if (sctp_style(sk, TCP))
4332− params.assoc_id = SCTP_FUTURE_ASSOC;
4140+ params->assoc_id = SCTP_FUTURE_ASSOC;
43334141
4334− if (params.assoc_id == SCTP_FUTURE_ASSOC ||
4335− params.assoc_id == SCTP_ALL_ASSOC)
4336− sp->default_ss = params.assoc_value;
4142+ if (params->assoc_id == SCTP_FUTURE_ASSOC ||
4143+ params->assoc_id == SCTP_ALL_ASSOC)
4144+ sp->default_ss = params->assoc_value;
43374145
4338− if (params.assoc_id == SCTP_CURRENT_ASSOC ||
4339− params.assoc_id == SCTP_ALL_ASSOC) {
4146+ if (params->assoc_id == SCTP_CURRENT_ASSOC ||
4147+ params->assoc_id == SCTP_ALL_ASSOC) {
43404148 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
43414149 int ret = sctp_sched_set_sched(asoc,
4342− params.assoc_value);
4150+ params->assoc_value);
43434151
43444152 if (ret && !retval)
43454153 retval = ret;
@@ -4350,38 +4158,32 @@ static int sctp_setsockopt_scheduler(struct sock *sk, · 4 unmodified lines
43504158 }
43514159
43524160 static int sctp_setsockopt_scheduler_value(struct sock *sk,
4353− char __user *optval,
4161+ struct sctp_stream_value *params,
43544162 unsigned int optlen)
43554163 {
4356− struct sctp_stream_value params;
43574164 struct sctp_association *asoc;
43584165 int retval = -EINVAL;
43594166
4360− if (optlen < sizeof(params))
4361− goto out;
4362−
4363− optlen = sizeof(params);
4364− if (copy_from_user(&params, optval, optlen)) {
4365− retval = -EFAULT;
4167+ if (optlen < sizeof(*params))
43664168 goto out;
4367− }
43684169
4369− asoc = sctp_id2assoc(sk, params.assoc_id);
4370− if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC &&
4170+ asoc = sctp_id2assoc(sk, params->assoc_id);
4171+ if (!asoc && params->assoc_id != SCTP_CURRENT_ASSOC &&
43714172 sctp_style(sk, UDP))
43724173 goto out;
43734174
43744175 if (asoc) {
4375− retval = sctp_sched_set_value(asoc, params.stream_id,
4376− params.stream_value, GFP_KERNEL);
4176+ retval = sctp_sched_set_value(asoc, params->stream_id,
4177+ params->stream_value, GFP_KERNEL);
43774178 goto out;
43784179 }
43794180
43804181 retval = 0;
43814182
43824183 list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) {
4383− int ret = sctp_sched_set_value(asoc, params.stream_id,
4384− params.stream_value, GFP_KERNEL);
4184+ int ret = sctp_sched_set_value(asoc, params->stream_id,
4185+ params->stream_value,
4186+ GFP_KERNEL);
43854187 if (ret && !retval) /* try to return the 1st error. */
43864188 retval = ret;
43874189 }
@@ -4391,46 +4193,30 @@ out: · 3 unmodified lines
43914193 }
43924194
43934195 static int sctp_setsockopt_interleaving_supported(struct sock *sk,
4394− char __user *optval,
4196+ struct sctp_assoc_value *p,
43954197 unsigned int optlen)
43964198 {
43974199 struct sctp_sock *sp = sctp_sk(sk);
4398− struct sctp_assoc_value params;
43994200 struct sctp_association *asoc;
4400− int retval = -EINVAL;
44014201
4402− if (optlen < sizeof(params))
4403− goto out;
4404−
4405− optlen = sizeof(params);
4406− if (copy_from_user(&params, optval, optlen)) {
4407− retval = -EFAULT;
4408− goto out;
4409− }
4202+ if (optlen < sizeof(*p))
4203+ return -EINVAL;
44104204
4411− asoc = sctp_id2assoc(sk, params.assoc_id);
4412− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4413− sctp_style(sk, UDP))
4414− goto out;
4205+ asoc = sctp_id2assoc(sk, p->assoc_id);
4206+ if (!asoc && p->assoc_id != SCTP_FUTURE_ASSOC && sctp_style(sk, UDP))
4207+ return -EINVAL;
44154208
44164209 if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) {
4417− retval = -EPERM;
4418− goto out;
4210+ return -EPERM;
44194211 }
44204212
4421− sp->ep->intl_enable = !!params.assoc_value;
4422−
4423− retval = 0;
4424−
4425−out:
4426− return retval;
4213+ sp->ep->intl_enable = !!p->assoc_value;
4214+ return 0;
44274215 }
44284216
4429−static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval,
4217+static int sctp_setsockopt_reuse_port(struct sock *sk, int *val,
44304218 unsigned int optlen)
44314219 {
4432− int val;
4433−
44344220 if (!sctp_style(sk, TCP))
44354221 return -EOPNOTSUPP;
44364222
@@ -4440,10 +4226,7 @@ static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval, · 3 unmodified lines
44404226 if (optlen < sizeof(int))
44414227 return -EINVAL;
44424228
4443− if (get_user(val, (int __user *)optval))
4444− return -EFAULT;
4445−
4446− sctp_sk(sk)->reuse = !!val;
4229+ sctp_sk(sk)->reuse = !!*val;
44474230
44484231 return 0;
44494232 }
@@ -4469,45 +4252,40 @@ static int sctp_assoc_ulpevent_type_set(struct sctp_event *param, · 19 unmodified lines
44694252 return 0;
44704253 }
44714254
4472−static int sctp_setsockopt_event(struct sock *sk, char __user *optval,
4255+static int sctp_setsockopt_event(struct sock *sk, struct sctp_event *param,
44734256 unsigned int optlen)
44744257 {
44754258 struct sctp_sock *sp = sctp_sk(sk);
44764259 struct sctp_association *asoc;
4477− struct sctp_event param;
44784260 int retval = 0;
44794261
4480− if (optlen < sizeof(param))
4262+ if (optlen < sizeof(*param))
44814263 return -EINVAL;
44824264
4483− optlen = sizeof(param);
4484− if (copy_from_user(&param, optval, optlen))
4485− return -EFAULT;
4486−
4487− if (param.se_type < SCTP_SN_TYPE_BASE ||
4488− param.se_type > SCTP_SN_TYPE_MAX)
4265+ if (param->se_type < SCTP_SN_TYPE_BASE ||
4266+ param->se_type > SCTP_SN_TYPE_MAX)
44894267 return -EINVAL;
44904268
4491− asoc = sctp_id2assoc(sk, param.se_assoc_id);
4492− if (!asoc && param.se_assoc_id > SCTP_ALL_ASSOC &&
4269+ asoc = sctp_id2assoc(sk, param->se_assoc_id);
4270+ if (!asoc && param->se_assoc_id > SCTP_ALL_ASSOC &&
44934271 sctp_style(sk, UDP))
44944272 return -EINVAL;
44954273
44964274 if (asoc)
4497− return sctp_assoc_ulpevent_type_set(&param, asoc);
4275+ return sctp_assoc_ulpevent_type_set(param, asoc);
44984276
44994277 if (sctp_style(sk, TCP))
4500− param.se_assoc_id = SCTP_FUTURE_ASSOC;
4278+ param->se_assoc_id = SCTP_FUTURE_ASSOC;
45014279
4502− if (param.se_assoc_id == SCTP_FUTURE_ASSOC ||
4503− param.se_assoc_id == SCTP_ALL_ASSOC)
4280+ if (param->se_assoc_id == SCTP_FUTURE_ASSOC ||
4281+ param->se_assoc_id == SCTP_ALL_ASSOC)
45044282 sctp_ulpevent_type_set(&sp->subscribe,
4505− param.se_type, param.se_on);
4283+ param->se_type, param->se_on);
45064284
4507− if (param.se_assoc_id == SCTP_CURRENT_ASSOC ||
4508− param.se_assoc_id == SCTP_ALL_ASSOC) {
4285+ if (param->se_assoc_id == SCTP_CURRENT_ASSOC ||
4286+ param->se_assoc_id == SCTP_ALL_ASSOC) {
45094287 list_for_each_entry(asoc, &sp->ep->asocs, asocs) {
4510− int ret = sctp_assoc_ulpevent_type_set(&param, asoc);
4288+ int ret = sctp_assoc_ulpevent_type_set(param, asoc);
45114289
45124290 if (ret && !retval)
45134291 retval = ret;
@@ -4518,29 +4296,23 @@ static int sctp_setsockopt_event(struct sock *sk, char __user *optval, · 4 unmodified lines
45184296 }
45194297
45204298 static int sctp_setsockopt_asconf_supported(struct sock *sk,
4521− char __user *optval,
4299+ struct sctp_assoc_value *params,
45224300 unsigned int optlen)
45234301 {
4524− struct sctp_assoc_value params;
45254302 struct sctp_association *asoc;
45264303 struct sctp_endpoint *ep;
45274304 int retval = -EINVAL;
45284305
4529− if (optlen != sizeof(params))
4530− goto out;
4531−
4532− if (copy_from_user(&params, optval, optlen)) {
4533− retval = -EFAULT;
4306+ if (optlen != sizeof(*params))
45344307 goto out;
4535− }
45364308
4537− asoc = sctp_id2assoc(sk, params.assoc_id);
4538− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4309+ asoc = sctp_id2assoc(sk, params->assoc_id);
4310+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
45394311 sctp_style(sk, UDP))
45404312 goto out;
45414313
45424314 ep = sctp_sk(sk)->ep;
4543− ep->asconf_enable = !!params.assoc_value;
4315+ ep->asconf_enable = !!params->assoc_value;
45444316
45454317 if (ep->asconf_enable && ep->auth_enable) {
45464318 sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
@@ -4554,29 +4326,23 @@ out: · 7 unmodified lines
45544326 }
45554327
45564328 static int sctp_setsockopt_auth_supported(struct sock *sk,
4557− char __user *optval,
4329+ struct sctp_assoc_value *params,
45584330 unsigned int optlen)
45594331 {
4560− struct sctp_assoc_value params;
45614332 struct sctp_association *asoc;
45624333 struct sctp_endpoint *ep;
45634334 int retval = -EINVAL;
45644335
4565− if (optlen != sizeof(params))
4566− goto out;
4567−
4568− if (copy_from_user(&params, optval, optlen)) {
4569− retval = -EFAULT;
4336+ if (optlen != sizeof(*params))
45704337 goto out;
4571− }
45724338
4573− asoc = sctp_id2assoc(sk, params.assoc_id);
4574− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4339+ asoc = sctp_id2assoc(sk, params->assoc_id);
4340+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
45754341 sctp_style(sk, UDP))
45764342 goto out;
45774343
45784344 ep = sctp_sk(sk)->ep;
4579− if (params.assoc_value) {
4345+ if (params->assoc_value) {
45804346 retval = sctp_auth_init(ep, GFP_KERNEL);
45814347 if (retval)
45824348 goto out;
@@ -4586,7 +4352,7 @@ static int sctp_setsockopt_auth_supported(struct sock *sk, · 3 unmodified lines
45864352 }
45874353 }
45884354
4589− ep->auth_enable = !!params.assoc_value;
4355+ ep->auth_enable = !!params->assoc_value;
45904356 retval = 0;
45914357
45924358 out:
@@ -4594,27 +4360,21 @@ out: · 1 unmodified line
45944360 }
45954361
45964362 static int sctp_setsockopt_ecn_supported(struct sock *sk,
4597− char __user *optval,
4363+ struct sctp_assoc_value *params,
45984364 unsigned int optlen)
45994365 {
4600− struct sctp_assoc_value params;
46014366 struct sctp_association *asoc;
46024367 int retval = -EINVAL;
46034368
4604− if (optlen != sizeof(params))
4369+ if (optlen != sizeof(*params))
46054370 goto out;
46064371
4607− if (copy_from_user(&params, optval, optlen)) {
4608− retval = -EFAULT;
4609− goto out;
4610− }
4611−
4612− asoc = sctp_id2assoc(sk, params.assoc_id);
4613− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4372+ asoc = sctp_id2assoc(sk, params->assoc_id);
4373+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
46144374 sctp_style(sk, UDP))
46154375 goto out;
46164376
4617− sctp_sk(sk)->ep->ecn_enable = !!params.assoc_value;
4377+ sctp_sk(sk)->ep->ecn_enable = !!params->assoc_value;
46184378 retval = 0;
46194379
46204380 out:
@@ -4622,33 +4382,27 @@ out: · 1 unmodified line
46224382 }
46234383
46244384 static int sctp_setsockopt_pf_expose(struct sock *sk,
4625− char __user *optval,
4385+ struct sctp_assoc_value *params,
46264386 unsigned int optlen)
46274387 {
4628− struct sctp_assoc_value params;
46294388 struct sctp_association *asoc;
46304389 int retval = -EINVAL;
46314390
4632− if (optlen != sizeof(params))
4391+ if (optlen != sizeof(*params))
46334392 goto out;
46344393
4635− if (copy_from_user(&params, optval, optlen)) {
4636− retval = -EFAULT;
4394+ if (params->assoc_value > SCTP_PF_EXPOSE_MAX)
46374395 goto out;
4638− }
46394396
4640− if (params.assoc_value > SCTP_PF_EXPOSE_MAX)
4641− goto out;
4642−
4643− asoc = sctp_id2assoc(sk, params.assoc_id);
4644− if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
4397+ asoc = sctp_id2assoc(sk, params->assoc_id);
4398+ if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
46454399 sctp_style(sk, UDP))
46464400 goto out;
46474401
46484402 if (asoc)
4649− asoc->pf_expose = params.assoc_value;
4403+ asoc->pf_expose = params->assoc_value;
46504404 else
4651− sctp_sk(sk)->pf_expose = params.assoc_value;
4405+ sctp_sk(sk)->pf_expose = params->assoc_value;
46524406 retval = 0;
46534407
46544408 out:
@@ -4677,6 +4431,7 @@ out: · 22 unmodified lines
46774431 static int sctp_setsockopt(struct sock *sk, int level, int optname,
46784432 char __user *optval, unsigned int optlen)
46794433 {
4434+ void *kopt = NULL;
46804435 int retval = 0;
46814436
46824437 pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
@@ -4689,8 +4444,14 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, · 6 unmodified lines
46894444 */
46904445 if (level != SOL_SCTP) {
46914446 struct sctp_af *af = sctp_sk(sk)->pf->af;
4692− retval = af->setsockopt(sk, level, optname, optval, optlen);
4693− goto out_nounlock;
4447+
4448+ return af->setsockopt(sk, level, optname, optval, optlen);
4449+ }
4450+
4451+ if (optlen > 0) {
4452+ kopt = memdup_user(optval, optlen);
4453+ if (IS_ERR(kopt))
4454+ return PTR_ERR(kopt);
46944455 }
46954456
46964457 lock_sock(sk);
@@ -4698,179 +4459,174 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, · 1 unmodified line
46984459 switch (optname) {
46994460 case SCTP_SOCKOPT_BINDX_ADD:
47004461 /* 'optlen' is the size of the addresses buffer. */
4701− retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4702− optlen, SCTP_BINDX_ADD_ADDR);
4462+ retval = sctp_setsockopt_bindx(sk, kopt, optlen,
4463+ SCTP_BINDX_ADD_ADDR);
47034464 break;
47044465
47054466 case SCTP_SOCKOPT_BINDX_REM:
47064467 /* 'optlen' is the size of the addresses buffer. */
4707− retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
4708− optlen, SCTP_BINDX_REM_ADDR);
4468+ retval = sctp_setsockopt_bindx(sk, kopt, optlen,
4469+ SCTP_BINDX_REM_ADDR);
47094470 break;
47104471
47114472 case SCTP_SOCKOPT_CONNECTX_OLD:
47124473 /* 'optlen' is the size of the addresses buffer. */
4713− retval = sctp_setsockopt_connectx_old(sk,
4714− (struct sockaddr __user *)optval,
4715− optlen);
4474+ retval = sctp_setsockopt_connectx_old(sk, kopt, optlen);
47164475 break;
47174476
47184477 case SCTP_SOCKOPT_CONNECTX:
47194478 /* 'optlen' is the size of the addresses buffer. */
4720− retval = sctp_setsockopt_connectx(sk,
4721− (struct sockaddr __user *)optval,
4722− optlen);
4479+ retval = sctp_setsockopt_connectx(sk, kopt, optlen);
47234480 break;
47244481
47254482 case SCTP_DISABLE_FRAGMENTS:
4726− retval = sctp_setsockopt_disable_fragments(sk, optval, optlen);
4483+ retval = sctp_setsockopt_disable_fragments(sk, kopt, optlen);
47274484 break;
47284485
47294486 case SCTP_EVENTS:
4730− retval = sctp_setsockopt_events(sk, optval, optlen);
4487+ retval = sctp_setsockopt_events(sk, kopt, optlen);
47314488 break;
47324489
47334490 case SCTP_AUTOCLOSE:
4734− retval = sctp_setsockopt_autoclose(sk, optval, optlen);
4491+ retval = sctp_setsockopt_autoclose(sk, kopt, optlen);
47354492 break;
47364493
47374494 case SCTP_PEER_ADDR_PARAMS:
4738− retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
4495+ retval = sctp_setsockopt_peer_addr_params(sk, kopt, optlen);
47394496 break;
47404497
47414498 case SCTP_DELAYED_SACK:
4742− retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
4499+ retval = sctp_setsockopt_delayed_ack(sk, kopt, optlen);
47434500 break;
47444501 case SCTP_PARTIAL_DELIVERY_POINT:
4745− retval = sctp_setsockopt_partial_delivery_point(sk, optval, optlen);
4502+ retval = sctp_setsockopt_partial_delivery_point(sk, kopt, optlen);
47464503 break;
47474504
47484505 case SCTP_INITMSG:
4749− retval = sctp_setsockopt_initmsg(sk, optval, optlen);
4506+ retval = sctp_setsockopt_initmsg(sk, kopt, optlen);
47504507 break;
47514508 case SCTP_DEFAULT_SEND_PARAM:
4752− retval = sctp_setsockopt_default_send_param(sk, optval,
4753− optlen);
4509+ retval = sctp_setsockopt_default_send_param(sk, kopt, optlen);
47544510 break;
47554511 case SCTP_DEFAULT_SNDINFO:
4756− retval = sctp_setsockopt_default_sndinfo(sk, optval, optlen);
4512+ retval = sctp_setsockopt_default_sndinfo(sk, kopt, optlen);
47574513 break;
47584514 case SCTP_PRIMARY_ADDR:
4759− retval = sctp_setsockopt_primary_addr(sk, optval, optlen);
4515+ retval = sctp_setsockopt_primary_addr(sk, kopt, optlen);
47604516 break;
47614517 case SCTP_SET_PEER_PRIMARY_ADDR:
4762− retval = sctp_setsockopt_peer_primary_addr(sk, optval, optlen);
4518+ retval = sctp_setsockopt_peer_primary_addr(sk, kopt, optlen);
47634519 break;
47644520 case SCTP_NODELAY:
4765− retval = sctp_setsockopt_nodelay(sk, optval, optlen);
4521+ retval = sctp_setsockopt_nodelay(sk, kopt, optlen);
47664522 break;
47674523 case SCTP_RTOINFO:
4768− retval = sctp_setsockopt_rtoinfo(sk, optval, optlen);
4524+ retval = sctp_setsockopt_rtoinfo(sk, kopt, optlen);
47694525 break;
47704526 case SCTP_ASSOCINFO:
4771− retval = sctp_setsockopt_associnfo(sk, optval, optlen);
4527+ retval = sctp_setsockopt_associnfo(sk, kopt, optlen);
47724528 break;
47734529 case SCTP_I_WANT_MAPPED_V4_ADDR:
4774− retval = sctp_setsockopt_mappedv4(sk, optval, optlen);
4530+ retval = sctp_setsockopt_mappedv4(sk, kopt, optlen);
47754531 break;
47764532 case SCTP_MAXSEG:
4777− retval = sctp_setsockopt_maxseg(sk, optval, optlen);
4533+ retval = sctp_setsockopt_maxseg(sk, kopt, optlen);
47784534 break;
47794535 case SCTP_ADAPTATION_LAYER:
4780− retval = sctp_setsockopt_adaptation_layer(sk, optval, optlen);
4536+ retval = sctp_setsockopt_adaptation_layer(sk, kopt, optlen);
47814537 break;
47824538 case SCTP_CONTEXT:
4783− retval = sctp_setsockopt_context(sk, optval, optlen);
4539+ retval = sctp_setsockopt_context(sk, kopt, optlen);
47844540 break;
47854541 case SCTP_FRAGMENT_INTERLEAVE:
4786− retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen);
4542+ retval = sctp_setsockopt_fragment_interleave(sk, kopt, optlen);
47874543 break;
47884544 case SCTP_MAX_BURST:
4789− retval = sctp_setsockopt_maxburst(sk, optval, optlen);
4545+ retval = sctp_setsockopt_maxburst(sk, kopt, optlen);
47904546 break;
47914547 case SCTP_AUTH_CHUNK:
4792− retval = sctp_setsockopt_auth_chunk(sk, optval, optlen);
4548+ retval = sctp_setsockopt_auth_chunk(sk, kopt, optlen);
47934549 break;
47944550 case SCTP_HMAC_IDENT:
4795− retval = sctp_setsockopt_hmac_ident(sk, optval, optlen);
4551+ retval = sctp_setsockopt_hmac_ident(sk, kopt, optlen);
47964552 break;
47974553 case SCTP_AUTH_KEY:
4798− retval = sctp_setsockopt_auth_key(sk, optval, optlen);
4554+ retval = sctp_setsockopt_auth_key(sk, kopt, optlen);
47994555 break;
48004556 case SCTP_AUTH_ACTIVE_KEY:
4801− retval = sctp_setsockopt_active_key(sk, optval, optlen);
4557+ retval = sctp_setsockopt_active_key(sk, kopt, optlen);
48024558 break;
48034559 case SCTP_AUTH_DELETE_KEY:
4804− retval = sctp_setsockopt_del_key(sk, optval, optlen);
4560+ retval = sctp_setsockopt_del_key(sk, kopt, optlen);
48054561 break;
48064562 case SCTP_AUTH_DEACTIVATE_KEY:
4807− retval = sctp_setsockopt_deactivate_key(sk, optval, optlen);
4563+ retval = sctp_setsockopt_deactivate_key(sk, kopt, optlen);
48084564 break;
48094565 case SCTP_AUTO_ASCONF:
4810− retval = sctp_setsockopt_auto_asconf(sk, optval, optlen);
4566+ retval = sctp_setsockopt_auto_asconf(sk, kopt, optlen);
48114567 break;
48124568 case SCTP_PEER_ADDR_THLDS:
4813− retval = sctp_setsockopt_paddr_thresholds(sk, optval, optlen,
4569+ retval = sctp_setsockopt_paddr_thresholds(sk, kopt, optlen,
48144570 false);
48154571 break;
48164572 case SCTP_PEER_ADDR_THLDS_V2:
4817− retval = sctp_setsockopt_paddr_thresholds(sk, optval, optlen,
4573+ retval = sctp_setsockopt_paddr_thresholds(sk, kopt, optlen,
48184574 true);
48194575 break;
48204576 case SCTP_RECVRCVINFO:
4821− retval = sctp_setsockopt_recvrcvinfo(sk, optval, optlen);
4577+ retval = sctp_setsockopt_recvrcvinfo(sk, kopt, optlen);
48224578 break;
48234579 case SCTP_RECVNXTINFO:
4824− retval = sctp_setsockopt_recvnxtinfo(sk, optval, optlen);
4580+ retval = sctp_setsockopt_recvnxtinfo(sk, kopt, optlen);
48254581 break;
48264582 case SCTP_PR_SUPPORTED:
4827− retval = sctp_setsockopt_pr_supported(sk, optval, optlen);
4583+ retval = sctp_setsockopt_pr_supported(sk, kopt, optlen);
48284584 break;
48294585 case SCTP_DEFAULT_PRINFO:
4830− retval = sctp_setsockopt_default_prinfo(sk, optval, optlen);
4586+ retval = sctp_setsockopt_default_prinfo(sk, kopt, optlen);
48314587 break;
48324588 case SCTP_RECONFIG_SUPPORTED:
4833− retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen);
4589+ retval = sctp_setsockopt_reconfig_supported(sk, kopt, optlen);
48344590 break;
48354591 case SCTP_ENABLE_STREAM_RESET:
4836− retval = sctp_setsockopt_enable_strreset(sk, optval, optlen);
4592+ retval = sctp_setsockopt_enable_strreset(sk, kopt, optlen);
48374593 break;
48384594 case SCTP_RESET_STREAMS:
4839− retval = sctp_setsockopt_reset_streams(sk, optval, optlen);
4595+ retval = sctp_setsockopt_reset_streams(sk, kopt, optlen);
48404596 break;
48414597 case SCTP_RESET_ASSOC:
4842− retval = sctp_setsockopt_reset_assoc(sk, optval, optlen);
4598+ retval = sctp_setsockopt_reset_assoc(sk, kopt, optlen);
48434599 break;
48444600 case SCTP_ADD_STREAMS:
4845− retval = sctp_setsockopt_add_streams(sk, optval, optlen);
4601+ retval = sctp_setsockopt_add_streams(sk, kopt, optlen);
48464602 break;
48474603 case SCTP_STREAM_SCHEDULER:
4848− retval = sctp_setsockopt_scheduler(sk, optval, optlen);
4604+ retval = sctp_setsockopt_scheduler(sk, kopt, optlen);
48494605 break;
48504606 case SCTP_STREAM_SCHEDULER_VALUE:
4851− retval = sctp_setsockopt_scheduler_value(sk, optval, optlen);
4607+ retval = sctp_setsockopt_scheduler_value(sk, kopt, optlen);
48524608 break;
48534609 case SCTP_INTERLEAVING_SUPPORTED:
4854− retval = sctp_setsockopt_interleaving_supported(sk, optval,
4610+ retval = sctp_setsockopt_interleaving_supported(sk, kopt,
48554611 optlen);
48564612 break;
48574613 case SCTP_REUSE_PORT:
4858− retval = sctp_setsockopt_reuse_port(sk, optval, optlen);
4614+ retval = sctp_setsockopt_reuse_port(sk, kopt, optlen);
48594615 break;
48604616 case SCTP_EVENT:
4861− retval = sctp_setsockopt_event(sk, optval, optlen);
4617+ retval = sctp_setsockopt_event(sk, kopt, optlen);
48624618 break;
48634619 case SCTP_ASCONF_SUPPORTED:
4864− retval = sctp_setsockopt_asconf_supported(sk, optval, optlen);
4620+ retval = sctp_setsockopt_asconf_supported(sk, kopt, optlen);
48654621 break;
48664622 case SCTP_AUTH_SUPPORTED:
4867− retval = sctp_setsockopt_auth_supported(sk, optval, optlen);
4623+ retval = sctp_setsockopt_auth_supported(sk, kopt, optlen);
48684624 break;
48694625 case SCTP_ECN_SUPPORTED:
4870− retval = sctp_setsockopt_ecn_supported(sk, optval, optlen);
4626+ retval = sctp_setsockopt_ecn_supported(sk, kopt, optlen);
48714627 break;
48724628 case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
4873− retval = sctp_setsockopt_pf_expose(sk, optval, optlen);
4629+ retval = sctp_setsockopt_pf_expose(sk, kopt, optlen);
48744630 break;
48754631 default:
48764632 retval = -ENOPROTOOPT;
@@ -4878,8 +4634,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, · 1 unmodified line
48784634 }
48794635
48804636 release_sock(sk);
4881−
4882−out_nounlock:
4637+ kfree(kopt);
48834638 return retval;
48844639 }
48854640

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t