1 files changed, 24 insertions, 347 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 3a95fcb17a9..89ab66e5474 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -394,7 +394,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 
         /* Refresh ephemeral port.  */
         if (!bp->port)
-                bp->port = inet_sk(sk)->num;
+                bp->port = inet_sk(sk)->inet_num;
 
         /* Add the address to the bind address list.
          * Use GFP_ATOMIC since BHs will be disabled.
@@ -403,7 +403,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
 
         /* Copy back into socket for getsockname() use. */
         if (!ret) {
-                inet_sk(sk)->sport = htons(inet_sk(sk)->num);
+                inet_sk(sk)->inet_sport = htons(inet_sk(sk)->inet_num);
                 af->to_sk_saddr(addr, sk);
         }
 
@@ -1117,7 +1117,7 @@ static int __sctp_connect(struct sock* sk,
         }
 
         /* Initialize sk's dport and daddr for getpeername() */
-        inet_sk(sk)->dport = htons(asoc->peer.port);
+        inet_sk(sk)->inet_dport = htons(asoc->peer.port);
         af = sctp_get_af_specific(sa_addr->sa.sa_family);
         af->to_sk_daddr(sa_addr, sk);
         sk->sk_err = 0;
@@ -1968,7 +1968,7 @@ SCTP_STATIC int sctp_recvmsg(struct kiocb *iocb, struct sock *sk,
         if (err)
                 goto out_free;
 
-        sock_recv_timestamp(msg, sk, skb);
+        sock_recv_ts_and_drops(msg, sk, skb);
         if (sctp_ulpevent_is_notification(event)) {
                 msg->msg_flags |= MSG_NOTIFICATION;
                 sp->pf->event_msgname(event, msg->msg_name, addr_len);
@@ -2086,6 +2086,9 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
                 return -EINVAL;
         if (copy_from_user(&sp->autoclose, optval, optlen))
                 return -EFAULT;
+        /* make sure it won't exceed MAX_SCHEDULE_TIMEOUT */
+        if (sp->autoclose > (MAX_SCHEDULE_TIMEOUT / HZ) )
+                sp->autoclose = (__u32)(MAX_SCHEDULE_TIMEOUT / HZ) ;
 
         return 0;
 }
@@ -2311,11 +2314,10 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
                 }
         }
 
-        /* Note that unless the spp_flag is set to SPP_PMTUD_ENABLE the value
-         * of this field is ignored.  Note also that a value of zero
-         * indicates the current setting should be left unchanged.
+        /* Note that a value of zero indicates the current setting should be
+           left unchanged.
          */
-        if ((params->spp_flags & SPP_PMTUD_ENABLE) && params->spp_pathmaxrxt) {
+        if (params->spp_pathmaxrxt) {
                 if (trans) {
                         trans->pathmaxrxt = params->spp_pathmaxrxt;
                 } else if (asoc) {
@@ -2354,8 +2356,8 @@ static int sctp_setsockopt_peer_addr_params(struct sock *sk,
             pmtud_change     == SPP_PMTUD ||
             sackdelay_change == SPP_SACKDELAY ||
             params.spp_sackdelay > 500 ||
-            (params.spp_pathmtu
-            && params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
+            (params.spp_pathmtu &&
+             params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
                 return -EINVAL;
 
         /* If an address other than INADDR_ANY is specified, and
@@ -4349,90 +4351,6 @@ static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval
         return 0;
 }
 
-static int sctp_getsockopt_peer_addrs_num_old(struct sock *sk, int len,
-                                              char __user *optval,
-                                              int __user *optlen)
-{
-        sctp_assoc_t id;
-        struct sctp_association *asoc;
-        struct list_head *pos;
-        int cnt = 0;
-
-        if (len < sizeof(sctp_assoc_t))
-                return -EINVAL;
-
-        if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
-                return -EFAULT;
-
-        printk(KERN_WARNING "SCTP: Use of SCTP_GET_PEER_ADDRS_NUM_OLD "
-                            "socket option deprecated\n");
-        /* For UDP-style sockets, id specifies the association to query.  */
-        asoc = sctp_id2assoc(sk, id);
-        if (!asoc)
-                return -EINVAL;
-
-        list_for_each(pos, &asoc->peer.transport_addr_list) {
-                cnt ++;
-        }
-
-        return cnt;
-}
-
-/*
- * Old API for getting list of peer addresses. Does not work for 32-bit
- * programs running on a 64-bit kernel
- */
-static int sctp_getsockopt_peer_addrs_old(struct sock *sk, int len,
-                                          char __user *optval,
-                                          int __user *optlen)
-{
-        struct sctp_association *asoc;
-        int cnt = 0;
-        struct sctp_getaddrs_old getaddrs;
-        struct sctp_transport *from;
-        void __user *to;
-        union sctp_addr temp;
-        struct sctp_sock *sp = sctp_sk(sk);
-        int addrlen;
-
-        if (len < sizeof(struct sctp_getaddrs_old))
-                return -EINVAL;
-
-        len = sizeof(struct sctp_getaddrs_old);
-
-        if (copy_from_user(&getaddrs, optval, len))
-                return -EFAULT;
-
-        if (getaddrs.addr_num <= 0) return -EINVAL;
-
-        printk(KERN_WARNING "SCTP: Use of SCTP_GET_PEER_ADDRS_OLD "
-                            "socket option deprecated\n");
-
-        /* For UDP-style sockets, id specifies the association to query.  */
-        asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
-        if (!asoc)
-                return -EINVAL;
-
-        to = (void __user *)getaddrs.addrs;
-        list_for_each_entry(from, &asoc->peer.transport_addr_list,
-                                transports) {
-                memcpy(&temp, &from->ipaddr, sizeof(temp));
-                sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
-                addrlen = sctp_get_af_specific(sk->sk_family)->sockaddr_len;
-                if (copy_to_user(to, &temp, addrlen))
-                        return -EFAULT;
-                to += addrlen ;
-                cnt ++;
-                if (cnt >= getaddrs.addr_num) break;
-        }
-        getaddrs.addr_num = cnt;
-        if (put_user(len, optlen))
-                return -EFAULT;
-        if (copy_to_user(optval, &getaddrs, len))
-                return -EFAULT;
-
-        return 0;
-}
 
 static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
                                       char __user *optval, int __user *optlen)
@@ -4485,125 +4403,6 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
         return 0;
 }
 
-static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
-                                               char __user *optval,
-                                               int __user *optlen)
-{
-        sctp_assoc_t id;
-        struct sctp_bind_addr *bp;
-        struct sctp_association *asoc;
-        struct sctp_sockaddr_entry *addr;
-        int cnt = 0;
-
-        if (len < sizeof(sctp_assoc_t))
-                return -EINVAL;
-
-        if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))
-                return -EFAULT;
-
-        printk(KERN_WARNING "SCTP: Use of SCTP_GET_LOCAL_ADDRS_NUM_OLD "
-                            "socket option deprecated\n");
-
-        /*
-         *  For UDP-style sockets, id specifies the association to query.
-         *  If the id field is set to the value '0' then the locally bound
-         *  addresses are returned without regard to any particular
-         *  association.
-         */
-        if (0 == id) {
-                bp = &sctp_sk(sk)->ep->base.bind_addr;
-        } else {
-                asoc = sctp_id2assoc(sk, id);
-                if (!asoc)
-                        return -EINVAL;
-                bp = &asoc->base.bind_addr;
-        }
-
-        /* If the endpoint is bound to 0.0.0.0 or ::0, count the valid
-         * addresses from the global local address list.
-         */
-        if (sctp_list_single_entry(&bp->address_list)) {
-                addr = list_entry(bp->address_list.next,
-                                  struct sctp_sockaddr_entry, list);
-                if (sctp_is_any(sk, &addr->a)) {
-                        rcu_read_lock();
-                        list_for_each_entry_rcu(addr,
-                                                &sctp_local_addr_list, list) {
-                                if (!addr->valid)
-                                        continue;
-
-                                if ((PF_INET == sk->sk_family) &&
-                                    (AF_INET6 == addr->a.sa.sa_family))
-                                        continue;
-
-                                if ((PF_INET6 == sk->sk_family) &&
-                                    inet_v6_ipv6only(sk) &&
-                                    (AF_INET == addr->a.sa.sa_family))
-                                        continue;
-
-                                cnt++;
-                        }
-                        rcu_read_unlock();
-                } else {
-                        cnt = 1;
-                }
-                goto done;
-        }
-
-        /* Protection on the bound address list is not needed,
-         * since in the socket option context we hold the socket lock,
-         * so there is no way that the bound address list can change.
-         */
-        list_for_each_entry(addr, &bp->address_list, list) {
-                cnt ++;
-        }
-done:
-        return cnt;
-}
-
-/* Helper function that copies local addresses to user and returns the number
- * of addresses copied.
- */
-static int sctp_copy_laddrs_old(struct sock *sk, __u16 port,
-                                        int max_addrs, void *to,
-                                        int *bytes_copied)
-{
-        struct sctp_sockaddr_entry *addr;
-        union sctp_addr temp;
-        int cnt = 0;
-        int addrlen;
-
-        rcu_read_lock();
-        list_for_each_entry_rcu(addr, &sctp_local_addr_list, list) {
-                if (!addr->valid)
-                        continue;
-
-                if ((PF_INET == sk->sk_family) &&
-                    (AF_INET6 == addr->a.sa.sa_family))
-                        continue;
-                if ((PF_INET6 == sk->sk_family) &&
-                    inet_v6_ipv6only(sk) &&
-                    (AF_INET == addr->a.sa.sa_family))
-                        continue;
-                memcpy(&temp, &addr->a, sizeof(temp));
-                if (!temp.v4.sin_port)
-                        temp.v4.sin_port = htons(port);
-
-                sctp_get_pf_specific(sk->sk_family)->addr_v4map(sctp_sk(sk),
-                                                                &temp);
-                addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
-                memcpy(to, &temp, addrlen);
-
-                to += addrlen;
-                *bytes_copied += addrlen;
-                cnt ++;
-                if (cnt >= max_addrs) break;
-        }
-        rcu_read_unlock();
-
-        return cnt;
-}
-
 static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
                             size_t space_left, int *bytes_copied)
 {
@@ -4647,112 +4446,6 @@ static int sctp_copy_laddrs(struct sock *sk, __u16 port, void *to,
         return cnt;
 }
 
-/* Old API for getting list of local addresses. Does not work for 32-bit
- * programs running on a 64-bit kernel
- */
-static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,
-                                           char __user *optval, int __user *optlen)
-{
-        struct sctp_bind_addr *bp;
-        struct sctp_association *asoc;
-        int cnt = 0;
-        struct sctp_getaddrs_old getaddrs;
-        struct sctp_sockaddr_entry *addr;
-        void __user *to;
-        union sctp_addr temp;
-        struct sctp_sock *sp = sctp_sk(sk);
-        int addrlen;
-        int err = 0;
-        void *addrs;
-        void *buf;
-        int bytes_copied = 0;
-
-        if (len < sizeof(struct sctp_getaddrs_old))
-                return -EINVAL;
-
-        len = sizeof(struct sctp_getaddrs_old);
-        if (copy_from_user(&getaddrs, optval, len))
-                return -EFAULT;
-
-        if (getaddrs.addr_num <= 0 ||
-            getaddrs.addr_num >= (INT_MAX / sizeof(union sctp_addr)))
-                return -EINVAL;
-
-        printk(KERN_WARNING "SCTP: Use of SCTP_GET_LOCAL_ADDRS_OLD "
-                            "socket option deprecated\n");
-
-        /*
-         *  For UDP-style sockets, id specifies the association to query.
-         *  If the id field is set to the value '0' then the locally bound
-         *  addresses are returned without regard to any particular
-         *  association.
-         */
-        if (0 == getaddrs.assoc_id) {
-                bp = &sctp_sk(sk)->ep->base.bind_addr;
-        } else {
-                asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
-                if (!asoc)
-                        return -EINVAL;
-                bp = &asoc->base.bind_addr;
-        }
-
-        to = getaddrs.addrs;
-
-        /* Allocate space for a local instance of packed array to hold all
-         * the data.  We store addresses here first and then put write them
-         * to the user in one shot.
-         */
-        addrs = kmalloc(sizeof(union sctp_addr) * getaddrs.addr_num,
-                        GFP_KERNEL);
-        if (!addrs)
-                return -ENOMEM;
-
-        /* If the endpoint is bound to 0.0.0.0 or ::0, get the valid
-         * addresses from the global local address list.
-         */
-        if (sctp_list_single_entry(&bp->address_list)) {
-                addr = list_entry(bp->address_list.next,
-                                  struct sctp_sockaddr_entry, list);
-                if (sctp_is_any(sk, &addr->a)) {
-                        cnt = sctp_copy_laddrs_old(sk, bp->port,
-                                                   getaddrs.addr_num,
-                                                   addrs, &bytes_copied);
-                        goto copy_getaddrs;
-                }
-        }
-
-        buf = addrs;
-        /* Protection on the bound address list is not needed since
-         * in the socket option context we hold a socket lock and
-         * thus the bound address list can't change.
-         */
-        list_for_each_entry(addr, &bp->address_list, list) {
-                memcpy(&temp, &addr->a, sizeof(temp));
-                sctp_get_pf_specific(sk->sk_family)->addr_v4map(sp, &temp);
-                addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
-                memcpy(buf, &temp, addrlen);
-                buf += addrlen;
-                bytes_copied += addrlen;
-                cnt ++;
-                if (cnt >= getaddrs.addr_num) break;
-        }
-
-copy_getaddrs:
-        /* copy the entire address list into the user provided space */
-        if (copy_to_user(to, addrs, bytes_copied)) {
-                err = -EFAULT;
-                goto error;
-        }
-
-        /* copy the leading structure back to user */
-        getaddrs.addr_num = cnt;
-        if (copy_to_user(optval, &getaddrs, len))
-                err = -EFAULT;
-
-error:
-        kfree(addrs);
-        return err;
-}
 
 static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
                                        char __user *optval, int __user *optlen)
@@ -5603,22 +5296,6 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
         case SCTP_INITMSG:
                 retval = sctp_getsockopt_initmsg(sk, len, optval, optlen);
                 break;
-        case SCTP_GET_PEER_ADDRS_NUM_OLD:
-                retval = sctp_getsockopt_peer_addrs_num_old(sk, len, optval,
-                                                            optlen);
-                break;
-        case SCTP_GET_LOCAL_ADDRS_NUM_OLD:
-                retval = sctp_getsockopt_local_addrs_num_old(sk, len, optval,
-                                                             optlen);
-                break;
-        case SCTP_GET_PEER_ADDRS_OLD:
-                retval = sctp_getsockopt_peer_addrs_old(sk, len, optval,
-                                                        optlen);
-                break;
-        case SCTP_GET_LOCAL_ADDRS_OLD:
-                retval = sctp_getsockopt_local_addrs_old(sk, len, optval,
-                                                         optlen);
-                break;
         case SCTP_GET_PEER_ADDRS:
                 retval = sctp_getsockopt_peer_addrs(sk, len, optval,
                                                     optlen);
@@ -5861,7 +5538,7 @@ pp_not_found:
          */
 success:
         if (!sctp_sk(sk)->bind_hash) {
-                inet_sk(sk)->num = snum;
+                inet_sk(sk)->inet_num = snum;
                 sk_add_bind_node(sk, &pp->owner);
                 sctp_sk(sk)->bind_hash = pp;
         }
@@ -5933,7 +5610,7 @@ SCTP_STATIC int sctp_listen_start(struct sock *sk, int backlog)
                 if (sctp_autobind(sk))
                         return -EAGAIN;
         } else {
-                if (sctp_get_port(sk, inet_sk(sk)->num)) {
+                if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
                         sk->sk_state = SCTP_SS_CLOSED;
                         return -EADDRINUSE;
                 }
@@ -6104,14 +5781,14 @@ static void sctp_bucket_destroy(struct sctp_bind_bucket *pp)
 static inline void __sctp_put_port(struct sock *sk)
 {
         struct sctp_bind_hashbucket *head =
-                &sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->num)];
+                &sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->inet_num)];
         struct sctp_bind_bucket *pp;
 
         sctp_spin_lock(&head->lock);
         pp = sctp_sk(sk)->bind_hash;
         __sk_del_bind_node(sk);
         sctp_sk(sk)->bind_hash = NULL;
-        inet_sk(sk)->num = 0;
+        inet_sk(sk)->inet_num = 0;
         sctp_bucket_destroy(pp);
         sctp_spin_unlock(&head->lock);
 }
@@ -6138,7 +5815,7 @@ static int sctp_autobind(struct sock *sk)
         /* Initialize a local sockaddr structure to INADDR_ANY. */
         af = sctp_sk(sk)->pf->af;
 
-        port = htons(inet_sk(sk)->num);
+        port = htons(inet_sk(sk)->inet_num);
         af->inaddr_any(&autoaddr, port);
 
         return sctp_do_bind(sk, &autoaddr, af->sockaddr_len);
@@ -6707,12 +6384,12 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
         /* Initialize sk's sport, dport, rcv_saddr and daddr for
          * getsockname() and getpeername()
          */
-        newinet->sport = inet->sport;
-        newinet->saddr = inet->saddr;
-        newinet->rcv_saddr = inet->rcv_saddr;
-        newinet->dport = htons(asoc->peer.port);
+        newinet->inet_sport = inet->inet_sport;
+        newinet->inet_saddr = inet->inet_saddr;
+        newinet->inet_rcv_saddr = inet->inet_rcv_saddr;
+        newinet->inet_dport = htons(asoc->peer.port);
         newinet->pmtudisc = inet->pmtudisc;
-        newinet->id = asoc->next_tsn ^ jiffies;
+        newinet->inet_id = asoc->next_tsn ^ jiffies;
 
         newinet->uc_ttl = inet->uc_ttl;
         newinet->mc_loop = 1;
@@ -6751,13 +6428,13 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
         newsp->hmac = NULL;
 
         /* Hook this new socket in to the bind_hash list. */
-        head = &sctp_port_hashtable[sctp_phashfn(inet_sk(oldsk)->num)];
+        head = &sctp_port_hashtable[sctp_phashfn(inet_sk(oldsk)->inet_num)];
         sctp_local_bh_disable();
         sctp_spin_lock(&head->lock);
         pp = sctp_sk(oldsk)->bind_hash;
         sk_add_bind_node(newsk, &pp->owner);
         sctp_sk(newsk)->bind_hash = pp;
-        inet_sk(newsk)->num = inet_sk(oldsk)->num;
+        inet_sk(newsk)->inet_num = inet_sk(oldsk)->inet_num;
         sctp_spin_unlock(&head->lock);
         sctp_local_bh_enable();