1 files changed, 97 insertions, 41 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index b811691c35bf..3fe906d65069 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -57,7 +57,6 @@
  * be incorporated into the next SCTP release.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/wait.h>
@@ -370,7 +369,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 
         /* Use GFP_ATOMIC since BHs are disabled.  */
         addr->v4.sin_port = ntohs(addr->v4.sin_port);
-        ret = sctp_add_bind_addr(bp, addr, GFP_ATOMIC);
+        ret = sctp_add_bind_addr(bp, addr, 1, GFP_ATOMIC);
         addr->v4.sin_port = htons(addr->v4.sin_port);
         sctp_write_unlock(&ep->base.addr_lock);
         sctp_local_bh_enable();
@@ -492,6 +491,7 @@ static int sctp_send_asconf_add_ip(struct sock		*sk,
         struct sctp_chunk               *chunk;
         struct sctp_sockaddr_entry      *laddr;
         union sctp_addr                 *addr;
+        union sctp_addr                 saveaddr;
         void                            *addr_buf;
         struct sctp_af                  *af;
         struct list_head                *pos;
@@ -559,14 +559,26 @@ static int sctp_send_asconf_add_ip(struct sock		*sk,
                 }
 
                 retval = sctp_send_asconf(asoc, chunk);
+                if (retval)
+                        goto out;
 
-                /* FIXME: After sending the add address ASCONF chunk, we
-                 * cannot append the address to the association's binding
-                 * address list, because the new address may be used as the
-                 * source of a message sent to the peer before the ASCONF
-                 * chunk is received by the peer.  So we should wait until
-                 * ASCONF_ACK is received.
+                /* Add the new addresses to the bind address list with
+                 * use_as_src set to 0.
                  */
+                sctp_local_bh_disable();
+                sctp_write_lock(&asoc->base.addr_lock);
+                addr_buf = addrs;
+                for (i = 0; i < addrcnt; i++) {
+                        addr = (union sctp_addr *)addr_buf;
+                        af = sctp_get_af_specific(addr->v4.sin_family);
+                        memcpy(&saveaddr, addr, af->sockaddr_len);
+                        saveaddr.v4.sin_port = ntohs(saveaddr.v4.sin_port);
+                        retval = sctp_add_bind_addr(bp, &saveaddr, 0,
+                                                    GFP_ATOMIC);
+                        addr_buf += af->sockaddr_len;
+                }
+                sctp_write_unlock(&asoc->base.addr_lock);
+                sctp_local_bh_enable();
         }
 
 out:
@@ -677,12 +689,15 @@ static int sctp_send_asconf_del_ip(struct sock		*sk,
         struct sctp_sock        *sp;
         struct sctp_endpoint    *ep;
         struct sctp_association *asoc;
+        struct sctp_transport   *transport;
         struct sctp_bind_addr   *bp;
         struct sctp_chunk       *chunk;
         union sctp_addr         *laddr;
+        union sctp_addr         saveaddr;
         void                    *addr_buf;
         struct sctp_af          *af;
-        struct list_head        *pos;
+        struct list_head        *pos, *pos1;
+        struct sctp_sockaddr_entry *saddr;
         int                     i;
         int                     retval = 0;
 
@@ -749,14 +764,42 @@ static int sctp_send_asconf_del_ip(struct sock		*sk,
                         goto out;
                 }
 
-                retval = sctp_send_asconf(asoc, chunk);
+                /* Reset use_as_src flag for the addresses in the bind address
+                 * list that are to be deleted.
+                 */
+                sctp_local_bh_disable();
+                sctp_write_lock(&asoc->base.addr_lock);
+                addr_buf = addrs;
+                for (i = 0; i < addrcnt; i++) {
+                        laddr = (union sctp_addr *)addr_buf;
+                        af = sctp_get_af_specific(laddr->v4.sin_family);
+                        memcpy(&saveaddr, laddr, af->sockaddr_len);
+                        saveaddr.v4.sin_port = ntohs(saveaddr.v4.sin_port);
+                        list_for_each(pos1, &bp->address_list) {
+                                saddr = list_entry(pos1,
+                                                   struct sctp_sockaddr_entry,
+                                                   list);
+                                if (sctp_cmp_addr_exact(&saddr->a, &saveaddr))
+                                        saddr->use_as_src = 0;
+                        }
+                        addr_buf += af->sockaddr_len;
+                }
+                sctp_write_unlock(&asoc->base.addr_lock);
+                sctp_local_bh_enable();
 
-                /* FIXME: After sending the delete address ASCONF chunk, we
-                 * cannot remove the addresses from the association's bind
-                 * address list, because there maybe some packet send to
-                 * the delete addresses, so we should wait until ASCONF_ACK
-                 * packet is received.
+                /* Update the route and saddr entries for all the transports
+                 * as some of the addresses in the bind address list are
+                 * about to be deleted and cannot be used as source addresses.
                  */
+                list_for_each(pos1, &asoc->peer.transport_addr_list) {
+                        transport = list_entry(pos1, struct sctp_transport,
+                                               transports);
+                        dst_release(transport->dst);
+                        sctp_transport_route(transport, NULL,
+                                             sctp_sk(asoc->base.sk));
+                }
+
+                retval = sctp_send_asconf(asoc, chunk);
         }
 out:
         return retval;
@@ -1246,9 +1289,13 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout)
                         }
                 }
 
-                if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)
-                        sctp_primitive_ABORT(asoc, NULL);
-                else
+                if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) {
+                        struct sctp_chunk *chunk;
+
+                        chunk = sctp_make_abort_user(asoc, NULL, 0);
+                        if (chunk)
+                                sctp_primitive_ABORT(asoc, chunk);
+                } else
                         sctp_primitive_SHUTDOWN(asoc, NULL);
         }
 
@@ -1477,8 +1524,16 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
                         goto out_unlock;
                 }
                 if (sinfo_flags & SCTP_ABORT) {
+                        struct sctp_chunk *chunk;
+
+                        chunk = sctp_make_abort_user(asoc, msg, msg_len);
+                        if (!chunk) {
+                                err = -ENOMEM;
+                                goto out_unlock;
+                        }
+
                         SCTP_DEBUG_PRINTK("Aborting association: %p\n", asoc);
-                        sctp_primitive_ABORT(asoc, msg);
+                        sctp_primitive_ABORT(asoc, chunk);
                         err = 0;
                         goto out_unlock;
                 }
@@ -2026,13 +2081,13 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
  *                     SPP_SACKDELAY_ENABLE, setting both will have undefined
  *                     results.
  */
-int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
-                                struct sctp_transport   *trans,
-                                struct sctp_association *asoc,
-                                struct sctp_sock        *sp,
-                                int                      hb_change,
-                                int                      pmtud_change,
-                                int                      sackdelay_change)
+static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
+                                       struct sctp_transport   *trans,
+                                       struct sctp_association *asoc,
+                                       struct sctp_sock        *sp,
+                                       int                      hb_change,
+                                       int                      pmtud_change,
+                                       int                      sackdelay_change)
 {
         int error;
 
@@ -2915,7 +2970,7 @@ SCTP_STATIC struct sock *sctp_accept(struct sock *sk, int flags, int *err)
                 goto out;
         }
 
-        timeo = sock_rcvtimeo(sk, sk->sk_socket->file->f_flags & O_NONBLOCK);
+        timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 
         error = sctp_wait_for_accept(sk, timeo);
         if (error)
@@ -2990,14 +3045,14 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
         sp->initmsg.sinit_num_ostreams   = sctp_max_outstreams;
         sp->initmsg.sinit_max_instreams  = sctp_max_instreams;
         sp->initmsg.sinit_max_attempts   = sctp_max_retrans_init;
-        sp->initmsg.sinit_max_init_timeo = jiffies_to_msecs(sctp_rto_max);
+        sp->initmsg.sinit_max_init_timeo = sctp_rto_max;
 
         /* Initialize default RTO related parameters.  These parameters can
          * be modified for with the SCTP_RTOINFO socket option.
          */
-        sp->rtoinfo.srto_initial = jiffies_to_msecs(sctp_rto_initial);
-        sp->rtoinfo.srto_max     = jiffies_to_msecs(sctp_rto_max);
-        sp->rtoinfo.srto_min     = jiffies_to_msecs(sctp_rto_min);
+        sp->rtoinfo.srto_initial = sctp_rto_initial;
+        sp->rtoinfo.srto_max     = sctp_rto_max;
+        sp->rtoinfo.srto_min     = sctp_rto_min;
 
         /* Initialize default association related parameters. These parameters
          * can be modified with the SCTP_ASSOCINFO socket option.
@@ -3006,8 +3061,7 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
         sp->assocparams.sasoc_number_peer_destinations = 0;
         sp->assocparams.sasoc_peer_rwnd = 0;
         sp->assocparams.sasoc_local_rwnd = 0;
-        sp->assocparams.sasoc_cookie_life = 
-                jiffies_to_msecs(sctp_valid_cookie_life);
+        sp->assocparams.sasoc_cookie_life = sctp_valid_cookie_life;
 
         /* Initialize default event subscriptions. By default, all the
          * options are off. 
@@ -3017,10 +3071,10 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
         /* Default Peer Address Parameters.  These defaults can
          * be modified via SCTP_PEER_ADDR_PARAMS
          */
-        sp->hbinterval  = jiffies_to_msecs(sctp_hb_interval);
+        sp->hbinterval  = sctp_hb_interval;
         sp->pathmaxrxt  = sctp_max_retrans_path;
         sp->pathmtu     = 0; // allow default discovery
-        sp->sackdelay   = jiffies_to_msecs(sctp_sack_timeout);
+        sp->sackdelay   = sctp_sack_timeout;
         sp->param_flags = SPP_HB_ENABLE |
                           SPP_PMTUD_ENABLE |
                           SPP_SACKDELAY_ENABLE;
@@ -3030,8 +3084,8 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
          */
         sp->disable_fragments = 0;
 
-        /* Turn on/off any Nagle-like algorithm.  */
-        sp->nodelay           = 1;
+        /* Enable Nagle algorithm by default.  */
+        sp->nodelay           = 0;
 
         /* Enable by default. */
         sp->v4mapped          = 1;
@@ -4843,7 +4897,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog)
 int sctp_inet_listen(struct socket *sock, int backlog)
 {
         struct sock *sk = sock->sk;
-        struct crypto_tfm *tfm=NULL;
+        struct crypto_hash *tfm = NULL;
         int err = -EINVAL;
 
         if (unlikely(backlog < 0))
@@ -4856,7 +4910,7 @@ int sctp_inet_listen(struct socket *sock, int backlog)
 
         /* Allocate HMAC for generating cookie. */
         if (sctp_hmac_alg) {
-                tfm = sctp_crypto_alloc_tfm(sctp_hmac_alg, 0);
+                tfm = crypto_alloc_hash(sctp_hmac_alg, 0, CRYPTO_ALG_ASYNC);
                 if (!tfm) {
                         err = -ENOSYS;
                         goto out;
@@ -4882,7 +4936,7 @@ out:
         sctp_release_sock(sk);
         return err;
 cleanup:
-        sctp_crypto_free_tfm(tfm);
+        crypto_free_hash(tfm);
         goto out;
 }
 
@@ -4978,7 +5032,7 @@ static struct sctp_bind_bucket *sctp_bucket_create(
 /* Caller must hold hashbucket lock for this tb with local BH disabled */
 static void sctp_bucket_destroy(struct sctp_bind_bucket *pp)
 {
-        if (hlist_empty(&pp->owner)) {
+        if (pp && hlist_empty(&pp->owner)) {
                 if (pp->next)
                         pp->next->pprev = pp->pprev;
                 *(pp->pprev) = pp->next;
@@ -5564,6 +5618,8 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
         /* Copy the bind_addr list from the original endpoint to the new
          * endpoint so that we can handle restarts properly
          */
+        if (PF_INET6 == assoc->base.sk->sk_family)
+                flags = SCTP_ADDR6_ALLOWED;
         if (assoc->peer.ipv4_address)
                 flags |= SCTP_ADDR4_PEERSUPP;
         if (assoc->peer.ipv6_address)