1 files changed, 46 insertions, 8 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 6140471efd4b..9874e60c9b0d 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -999,7 +999,7 @@ static int sctp_setsockopt_bindx(struct sock *sk,
         if (unlikely(addrs_size <= 0))
                 return -EINVAL;
 
-        kaddrs = vmemdup_user(addrs, addrs_size);
+        kaddrs = memdup_user(addrs, addrs_size);
         if (unlikely(IS_ERR(kaddrs)))
                 return PTR_ERR(kaddrs);
 
@@ -1007,7 +1007,7 @@ static int sctp_setsockopt_bindx(struct sock *sk,
         addr_buf = kaddrs;
         while (walk_size < addrs_size) {
                 if (walk_size + sizeof(sa_family_t) > addrs_size) {
-                        kvfree(kaddrs);
+                        kfree(kaddrs);
                         return -EINVAL;
                 }
 
@@ -1018,7 +1018,7 @@ static int sctp_setsockopt_bindx(struct sock *sk,
                  * causes the address buffer to overflow return EINVAL.
                  */
                 if (!af || (walk_size + af->sockaddr_len) > addrs_size) {
-                        kvfree(kaddrs);
+                        kfree(kaddrs);
                         return -EINVAL;
                 }
                 addrcnt++;
@@ -1054,7 +1054,7 @@ static int sctp_setsockopt_bindx(struct sock *sk,
         }
 
 out:
-        kvfree(kaddrs);
+        kfree(kaddrs);
 
         return err;
 }
@@ -1329,7 +1329,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk,
         if (unlikely(addrs_size <= 0))
                 return -EINVAL;
 
-        kaddrs = vmemdup_user(addrs, addrs_size);
+        kaddrs = memdup_user(addrs, addrs_size);
         if (unlikely(IS_ERR(kaddrs)))
                 return PTR_ERR(kaddrs);
 
@@ -1349,7 +1349,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk,
         err = __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
 
 out_free:
-        kvfree(kaddrs);
+        kfree(kaddrs);
 
         return err;
 }
@@ -2920,6 +2920,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk,
                 return 0;
         }
 
+        if (sctp_style(sk, TCP))
+                params.sack_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (params.sack_assoc_id == SCTP_FUTURE_ASSOC ||
             params.sack_assoc_id == SCTP_ALL_ASSOC) {
                 if (params.sack_delay) {
@@ -3024,6 +3027,9 @@ static int sctp_setsockopt_default_send_param(struct sock *sk,
                 return 0;
         }
 
+        if (sctp_style(sk, TCP))
+                info.sinfo_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (info.sinfo_assoc_id == SCTP_FUTURE_ASSOC ||
             info.sinfo_assoc_id == SCTP_ALL_ASSOC) {
                 sp->default_stream = info.sinfo_stream;
@@ -3081,6 +3087,9 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk,
                 return 0;
         }
 
+        if (sctp_style(sk, TCP))
+                info.snd_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||
             info.snd_assoc_id == SCTP_ALL_ASSOC) {
                 sp->default_stream = info.snd_sid;
@@ -3531,6 +3540,9 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
                 return 0;
         }
 
+        if (sctp_style(sk, TCP))
+                params.assoc_id = SCTP_FUTURE_ASSOC;
+
         if (params.assoc_id == SCTP_FUTURE_ASSOC ||
             params.assoc_id == SCTP_ALL_ASSOC)
                 sp->default_rcv_context = params.assoc_value;
@@ -3670,6 +3682,9 @@ static int sctp_setsockopt_maxburst(struct sock *sk,
                 return 0;
         }
 
+        if (sctp_style(sk, TCP))
+                params.assoc_id = SCTP_FUTURE_ASSOC;
+
         if (params.assoc_id == SCTP_FUTURE_ASSOC ||
             params.assoc_id == SCTP_ALL_ASSOC)
                 sp->max_burst = params.assoc_value;
@@ -3798,6 +3813,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
                 goto out;
         }
 
+        if (sctp_style(sk, TCP))
+                authkey->sca_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (authkey->sca_assoc_id == SCTP_FUTURE_ASSOC ||
             authkey->sca_assoc_id == SCTP_ALL_ASSOC) {
                 ret = sctp_auth_set_key(ep, asoc, authkey);
@@ -3853,6 +3871,9 @@ static int sctp_setsockopt_active_key(struct sock *sk,
         if (asoc)
                 return sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
 
+        if (sctp_style(sk, TCP))
+                val.scact_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
             val.scact_assoc_id == SCTP_ALL_ASSOC) {
                 ret = sctp_auth_set_active_key(ep, asoc, val.scact_keynumber);
@@ -3904,6 +3925,9 @@ static int sctp_setsockopt_del_key(struct sock *sk,
         if (asoc)
                 return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
 
+        if (sctp_style(sk, TCP))
+                val.scact_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
             val.scact_assoc_id == SCTP_ALL_ASSOC) {
                 ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber);
@@ -3954,6 +3978,9 @@ static int sctp_setsockopt_deactivate_key(struct sock *sk, char __user *optval,
         if (asoc)
                 return sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
 
+        if (sctp_style(sk, TCP))
+                val.scact_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (val.scact_assoc_id == SCTP_FUTURE_ASSOC ||
             val.scact_assoc_id == SCTP_ALL_ASSOC) {
                 ret = sctp_auth_deact_key_id(ep, asoc, val.scact_keynumber);
@@ -4169,6 +4196,9 @@ static int sctp_setsockopt_default_prinfo(struct sock *sk,
                 goto out;
         }
 
+        if (sctp_style(sk, TCP))
+                info.pr_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (info.pr_assoc_id == SCTP_FUTURE_ASSOC ||
             info.pr_assoc_id == SCTP_ALL_ASSOC) {
                 SCTP_PR_SET_POLICY(sp->default_flags, info.pr_policy);
@@ -4251,6 +4281,9 @@ static int sctp_setsockopt_enable_strreset(struct sock *sk,
                 goto out;
         }
 
+        if (sctp_style(sk, TCP))
+                params.assoc_id = SCTP_FUTURE_ASSOC;
+
         if (params.assoc_id == SCTP_FUTURE_ASSOC ||
             params.assoc_id == SCTP_ALL_ASSOC)
                 ep->strreset_enable = params.assoc_value;
@@ -4376,6 +4409,9 @@ static int sctp_setsockopt_scheduler(struct sock *sk,
         if (asoc)
                 return sctp_sched_set_sched(asoc, params.assoc_value);
 
+        if (sctp_style(sk, TCP))
+                params.assoc_id = SCTP_FUTURE_ASSOC;
+
         if (params.assoc_id == SCTP_FUTURE_ASSOC ||
             params.assoc_id == SCTP_ALL_ASSOC)
                 sp->default_ss = params.assoc_value;
@@ -4541,6 +4577,9 @@ static int sctp_setsockopt_event(struct sock *sk, char __user *optval,
         if (asoc)
                 return sctp_assoc_ulpevent_type_set(&param, asoc);
 
+        if (sctp_style(sk, TCP))
+                param.se_assoc_id = SCTP_FUTURE_ASSOC;
+
         if (param.se_assoc_id == SCTP_FUTURE_ASSOC ||
             param.se_assoc_id == SCTP_ALL_ASSOC)
                 sctp_ulpevent_type_set(&sp->subscribe,
@@ -9169,7 +9208,7 @@ static inline void sctp_copy_descendant(struct sock *sk_to,
 {
         int ancestor_size = sizeof(struct inet_sock) +
                             sizeof(struct sctp_sock) -
-                            offsetof(struct sctp_sock, auto_asconf_list);
+                            offsetof(struct sctp_sock, pd_lobby);
 
         if (sk_from->sk_family == PF_INET6)
                 ancestor_size += sizeof(struct ipv6_pinfo);
@@ -9253,7 +9292,6 @@ static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
          * 2) Peeling off partial delivery; keep pd_lobby in new pd_lobby.
          * 3) Peeling off non-partial delivery; move pd_lobby to receive_queue.
          */
-        skb_queue_head_init(&newsp->pd_lobby);
         atomic_set(&sctp_sk(newsk)->pd_mode, assoc->ulpq.pd_mode);
 
         if (atomic_read(&sctp_sk(oldsk)->pd_mode)) {