12 files changed, 271 insertions, 70 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 5b24ae0650d3..12b0f582a66b 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -71,7 +71,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
                                           const struct sctp_endpoint *ep,
                                           const struct sock *sk,
                                           sctp_scope_t scope,
-                                          unsigned int __nocast gfp)
+                                          gfp_t gfp)
 {
         struct sctp_sock *sp;
         int i;
@@ -273,7 +273,7 @@ fail_init:
 struct sctp_association *sctp_association_new(const struct sctp_endpoint *ep,
                                          const struct sock *sk,
                                          sctp_scope_t scope,
-                                         unsigned int __nocast gfp)
+                                         gfp_t gfp)
 {
         struct sctp_association *asoc;
 
@@ -479,7 +479,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
 /* Add a transport address to an association.  */
 struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
                                            const union sctp_addr *addr,
-                                           const unsigned int __nocast gfp,
+                                           const gfp_t gfp,
                                            const int peer_state)
 {
         struct sctp_transport *peer;
@@ -1231,7 +1231,7 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned len)
  * local endpoint and the remote peer.
  */
 int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,
-                                     unsigned int __nocast gfp)
+                                     gfp_t gfp)
 {
         sctp_scope_t scope;
         int flags;
@@ -1254,7 +1254,7 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,
 /* Build the association's bind address list from the cookie.  */
 int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc,
                                          struct sctp_cookie *cookie,
-                                         unsigned int __nocast gfp)
+                                         gfp_t gfp)
 {
         int var_size2 = ntohs(cookie->peer_init->chunk_hdr.length);
         int var_size3 = cookie->raw_addr_list_len;
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index f71549710f2e..2b962627f631 100644
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -53,7 +53,7 @@
 
 /* Forward declarations for internal helpers. */
 static int sctp_copy_one_addr(struct sctp_bind_addr *, union sctp_addr *,
-                              sctp_scope_t scope, unsigned int __nocast gfp,
+                              sctp_scope_t scope, gfp_t gfp,
                               int flags);
 static void sctp_bind_addr_clean(struct sctp_bind_addr *);
 
@@ -64,7 +64,7 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *);
  */
 int sctp_bind_addr_copy(struct sctp_bind_addr *dest, 
                         const struct sctp_bind_addr *src,
-                        sctp_scope_t scope, unsigned int __nocast gfp,
+                        sctp_scope_t scope, gfp_t gfp,
                         int flags)
 {
         struct sctp_sockaddr_entry *addr;
@@ -146,7 +146,7 @@ void sctp_bind_addr_free(struct sctp_bind_addr *bp)
 
 /* Add an address to the bind address list in the SCTP_bind_addr structure. */
 int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
-                       unsigned int __nocast gfp)
+                       gfp_t gfp)
 {
         struct sctp_sockaddr_entry *addr;
 
@@ -200,7 +200,7 @@ int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr)
  */
 union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp,
                                          int *addrs_len,
-                                         unsigned int __nocast gfp)
+                                         gfp_t gfp)
 {
         union sctp_params addrparms;
         union sctp_params retval;
@@ -252,7 +252,7 @@ end_raw:
  * address parameters).
  */
 int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
-                           int addrs_len, __u16 port, unsigned int __nocast gfp)
+                           int addrs_len, __u16 port, gfp_t gfp)
 {
         union sctp_addr_param *rawaddr;
         struct sctp_paramhdr *param;
@@ -350,7 +350,7 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,
 /* Copy out addresses from the global local address list. */
 static int sctp_copy_one_addr(struct sctp_bind_addr *dest, 
                               union sctp_addr *addr,
-                              sctp_scope_t scope, unsigned int __nocast gfp,
+                              sctp_scope_t scope, gfp_t gfp,
                               int flags)
 {
         int error = 0;
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index 61da2937e641..83ef411772f4 100644
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
@@ -62,7 +62,7 @@ static void sctp_datamsg_init(struct sctp_datamsg *msg)
 }
 
 /* Allocate and initialize datamsg. */
-SCTP_STATIC struct sctp_datamsg *sctp_datamsg_new(unsigned int __nocast gfp)
+SCTP_STATIC struct sctp_datamsg *sctp_datamsg_new(gfp_t gfp)
 {
         struct sctp_datamsg *msg;
         msg = kmalloc(sizeof(struct sctp_datamsg), gfp);
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index e22ccd655965..96984f7a2d69 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -68,7 +68,7 @@ static void sctp_endpoint_bh_rcv(struct sctp_endpoint *ep);
  */
 static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
                                                 struct sock *sk,
-                                                unsigned int __nocast gfp)
+                                                gfp_t gfp)
 {
         struct sctp_sock *sp = sctp_sk(sk);
         memset(ep, 0, sizeof(struct sctp_endpoint));
@@ -138,8 +138,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
 /* Create a sctp_endpoint with all that boring stuff initialized.
  * Returns NULL if there isn't enough memory.
  */
-struct sctp_endpoint *sctp_endpoint_new(struct sock *sk,
-                                        unsigned int __nocast gfp)
+struct sctp_endpoint *sctp_endpoint_new(struct sock *sk, gfp_t gfp)
 {
         struct sctp_endpoint *ep;
 
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index f01d1c9002a1..26de4d3e1bd9 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -219,7 +219,7 @@ static void sctp_free_local_addr_list(void)
 
 /* Copy the local addresses which are valid for 'scope' into 'bp'.  */
 int sctp_copy_local_addr_list(struct sctp_bind_addr *bp, sctp_scope_t scope,
-                              unsigned int __nocast gfp, int copy_flags)
+                              gfp_t gfp, int copy_flags)
 {
         struct sctp_sockaddr_entry *addr;
         int error = 0;
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 3868a8d70cc0..10e82ec2ebd3 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -78,7 +78,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
 static int sctp_process_param(struct sctp_association *asoc,
                               union sctp_params param,
                               const union sctp_addr *peer_addr,
-                              unsigned int __nocast gfp);
+                              gfp_t gfp);
 
 /* What was the inbound interface for this chunk? */
 int sctp_chunk_iif(const struct sctp_chunk *chunk)
@@ -174,7 +174,7 @@ void  sctp_init_cause(struct sctp_chunk *chunk, __u16 cause_code,
  */
 struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
                              const struct sctp_bind_addr *bp,
-                             unsigned int __nocast gfp, int vparam_len)
+                             gfp_t gfp, int vparam_len)
 {
         sctp_inithdr_t init;
         union sctp_params addrs;
@@ -261,7 +261,7 @@ nodata:
 
 struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
                                  const struct sctp_chunk *chunk,
-                                 unsigned int __nocast gfp, int unkparam_len)
+                                 gfp_t gfp, int unkparam_len)
 {
         sctp_inithdr_t initack;
         struct sctp_chunk *retval;
@@ -1234,7 +1234,7 @@ void sctp_chunk_assign_tsn(struct sctp_chunk *chunk)
 /* Create a CLOSED association to use with an incoming packet.  */
 struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *ep,
                                         struct sctp_chunk *chunk,
-                                        unsigned int __nocast gfp)
+                                        gfp_t gfp)
 {
         struct sctp_association *asoc;
         struct sk_buff *skb;
@@ -1349,7 +1349,7 @@ nodata:
 struct sctp_association *sctp_unpack_cookie(
         const struct sctp_endpoint *ep,
         const struct sctp_association *asoc,
-        struct sctp_chunk *chunk, unsigned int __nocast gfp,
+        struct sctp_chunk *chunk, gfp_t gfp,
         int *error, struct sctp_chunk **errp)
 {
         struct sctp_association *retval = NULL;
@@ -1814,7 +1814,7 @@ int sctp_verify_init(const struct sctp_association *asoc,
  */
 int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid,
                       const union sctp_addr *peer_addr,
-                      sctp_init_chunk_t *peer_init, unsigned int __nocast gfp)
+                      sctp_init_chunk_t *peer_init, gfp_t gfp)
 {
         union sctp_params param;
         struct sctp_transport *transport;
@@ -1985,7 +1985,7 @@ nomem:
 static int sctp_process_param(struct sctp_association *asoc,
                               union sctp_params param,
                               const union sctp_addr *peer_addr,
-                              unsigned int __nocast gfp)
+                              gfp_t gfp)
 {
         union sctp_addr addr;
         int i;
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 39c970b5b198..f84173ea8ec1 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -63,7 +63,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                                 void *event_arg,
                                 sctp_disposition_t status,
                                 sctp_cmd_seq_t *commands,
-                                unsigned int __nocast gfp);
+                                gfp_t gfp);
 static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                              sctp_state_t state,
                              struct sctp_endpoint *ep,
@@ -71,7 +71,7 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                              void *event_arg,
                              sctp_disposition_t status,
                              sctp_cmd_seq_t *commands,
-                             unsigned int __nocast gfp);
+                             gfp_t gfp);
 
 /********************************************************************
  * Helper functions
@@ -498,7 +498,7 @@ static int sctp_cmd_process_init(sctp_cmd_seq_t *commands,
                                  struct sctp_association *asoc,
                                  struct sctp_chunk *chunk,
                                  sctp_init_chunk_t *peer_init,
-                                 unsigned int __nocast gfp)
+                                 gfp_t gfp)
 {
         int error;
 
@@ -853,7 +853,7 @@ int sctp_do_sm(sctp_event_t event_type, sctp_subtype_t subtype,
                struct sctp_endpoint *ep,
                struct sctp_association *asoc,
                void *event_arg,
-               unsigned int __nocast gfp)
+               gfp_t gfp)
 {
         sctp_cmd_seq_t commands;
         const sctp_sm_table_entry_t *state_fn;
@@ -898,7 +898,7 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                              void *event_arg,
                              sctp_disposition_t status,
                              sctp_cmd_seq_t *commands,
-                             unsigned int __nocast gfp)
+                             gfp_t gfp)
 {
         int error;
 
@@ -986,7 +986,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                                 void *event_arg,
                                 sctp_disposition_t status,
                                 sctp_cmd_seq_t *commands,
-                                unsigned int __nocast gfp)
+                                gfp_t gfp)
 {
         int error = 0;
         int force;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 91ec8c936913..02e068d3450d 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3159,8 +3159,9 @@ static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval
         return 0;
 }
 
-static int sctp_getsockopt_peer_addrs_num(struct sock *sk, int len,
-                                          char __user *optval, int __user *optlen)
+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;
@@ -3185,23 +3186,28 @@ static int sctp_getsockopt_peer_addrs_num(struct sock *sk, int len,
         return cnt;
 }
 
-static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
-                                      char __user *optval, int __user *optlen)
+/* 
+ * 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;
         struct list_head *pos;
         int cnt = 0;
-        struct sctp_getaddrs getaddrs;
+        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))
+        if (len != sizeof(struct sctp_getaddrs_old))
                 return -EINVAL;
 
-        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs_old)))
                 return -EFAULT;
 
         if (getaddrs.addr_num <= 0) return -EINVAL;
@@ -3225,15 +3231,69 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
                 if (cnt >= getaddrs.addr_num) break;
         }
         getaddrs.addr_num = cnt;
-        if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs)))
+        if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs_old)))
+                return -EFAULT;
+
+        return 0;
+}
+
+static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+                                      char __user *optval, int __user *optlen)
+{
+        struct sctp_association *asoc;
+        struct list_head *pos;
+        int cnt = 0;
+        struct sctp_getaddrs getaddrs;
+        struct sctp_transport *from;
+        void __user *to;
+        union sctp_addr temp;
+        struct sctp_sock *sp = sctp_sk(sk);
+        int addrlen;
+        size_t space_left;
+        int bytes_copied;
+
+        if (len < sizeof(struct sctp_getaddrs))
+                return -EINVAL;
+
+        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+                return -EFAULT;
+
+        /* For UDP-style sockets, id specifies the association to query.  */
+        asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
+        if (!asoc)
+                return -EINVAL;
+
+        to = optval + offsetof(struct sctp_getaddrs,addrs);
+        space_left = len - sizeof(struct sctp_getaddrs) - 
+                        offsetof(struct sctp_getaddrs,addrs);
+
+        list_for_each(pos, &asoc->peer.transport_addr_list) {
+                from = list_entry(pos, struct sctp_transport, 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(space_left < addrlen)
+                        return -ENOMEM;
+                temp.v4.sin_port = htons(temp.v4.sin_port);
+                if (copy_to_user(to, &temp, addrlen))
+                        return -EFAULT;
+                to += addrlen;
+                cnt++;
+                space_left -= addrlen;
+        }
+
+        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
+                return -EFAULT;
+        bytes_copied = ((char __user *)to) - optval;
+        if (put_user(bytes_copied, optlen))
                 return -EFAULT;
 
         return 0;
 }
 
-static int sctp_getsockopt_local_addrs_num(struct sock *sk, int len,
-                                                char __user *optval,
-                                                int __user *optlen)
+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;
@@ -3306,8 +3366,8 @@ done:
 /* Helper function that copies local addresses to user and returns the number
  * of addresses copied.
  */
-static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, int max_addrs,
-                                    void __user *to)
+static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_addrs,
+                                        void __user *to)
 {
         struct list_head *pos;
         struct sctp_sockaddr_entry *addr;
@@ -3341,14 +3401,54 @@ static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, int max_addrs,
         return cnt;
 }
 
-static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
-                                       char __user *optval, int __user *optlen)
+static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port,
+                                    void * __user *to, size_t space_left)
+{
+        struct list_head *pos;
+        struct sctp_sockaddr_entry *addr;
+        unsigned long flags;
+        union sctp_addr temp;
+        int cnt = 0;
+        int addrlen;
+
+        sctp_spin_lock_irqsave(&sctp_local_addr_lock, flags);
+        list_for_each(pos, &sctp_local_addr_list) {
+                addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+                if ((PF_INET == sk->sk_family) && 
+                    (AF_INET6 == addr->a.sa.sa_family))
+                        continue;
+                memcpy(&temp, &addr->a, sizeof(temp));
+                sctp_get_pf_specific(sk->sk_family)->addr_v4map(sctp_sk(sk),
+                                                                &temp);
+                addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
+                if(space_left<addrlen)
+                        return -ENOMEM;
+                temp.v4.sin_port = htons(port);
+                if (copy_to_user(*to, &temp, addrlen)) {
+                        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock,
+                                                    flags);
+                        return -EFAULT;
+                }
+                *to += addrlen;
+                cnt ++;
+                space_left -= addrlen;
+        }
+        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock, flags);
+
+        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;
         struct list_head *pos;
         int cnt = 0;
-        struct sctp_getaddrs getaddrs;
+        struct sctp_getaddrs_old getaddrs;
         struct sctp_sockaddr_entry *addr;
         void __user *to;
         union sctp_addr temp;
@@ -3357,10 +3457,10 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
         rwlock_t *addr_lock;
         int err = 0;
 
-        if (len != sizeof(struct sctp_getaddrs))
+        if (len != sizeof(struct sctp_getaddrs_old))
                 return -EINVAL;
 
-        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs_old)))
                 return -EFAULT;
 
         if (getaddrs.addr_num <= 0) return -EINVAL;
@@ -3392,8 +3492,9 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
                 addr = list_entry(bp->address_list.next,
                                   struct sctp_sockaddr_entry, list);
                 if (sctp_is_any(&addr->a)) {
-                        cnt = sctp_copy_laddrs_to_user(sk, bp->port,
-                                                       getaddrs.addr_num, to);
+                        cnt = sctp_copy_laddrs_to_user_old(sk, bp->port,
+                                                           getaddrs.addr_num,
+                                                           to);
                         if (cnt < 0) {
                                 err = cnt;
                                 goto unlock;
@@ -3419,7 +3520,7 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
 
 copy_getaddrs:
         getaddrs.addr_num = cnt;
-        if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs)))
+        if (copy_to_user(optval, &getaddrs, sizeof(struct sctp_getaddrs_old)))
                 err = -EFAULT;
 
 unlock:
@@ -3427,6 +3528,99 @@ unlock:
         return err;
 }
 
+static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
+                                       char __user *optval, int __user *optlen)
+{
+        struct sctp_bind_addr *bp;
+        struct sctp_association *asoc;
+        struct list_head *pos;
+        int cnt = 0;
+        struct sctp_getaddrs getaddrs;
+        struct sctp_sockaddr_entry *addr;
+        void __user *to;
+        union sctp_addr temp;
+        struct sctp_sock *sp = sctp_sk(sk);
+        int addrlen;
+        rwlock_t *addr_lock;
+        int err = 0;
+        size_t space_left;
+        int bytes_copied;
+
+        if (len <= sizeof(struct sctp_getaddrs))
+                return -EINVAL;
+
+        if (copy_from_user(&getaddrs, optval, sizeof(struct sctp_getaddrs)))
+                return -EFAULT;
+
+        /*
+         *  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;
+                addr_lock = &sctp_sk(sk)->ep->base.addr_lock;
+        } else {
+                asoc = sctp_id2assoc(sk, getaddrs.assoc_id);
+                if (!asoc)
+                        return -EINVAL;
+                bp = &asoc->base.bind_addr;
+                addr_lock = &asoc->base.addr_lock;
+        }
+
+        to = optval + offsetof(struct sctp_getaddrs,addrs);
+        space_left = len - sizeof(struct sctp_getaddrs) -
+                         offsetof(struct sctp_getaddrs,addrs);
+
+        sctp_read_lock(addr_lock);
+
+        /* 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(&addr->a)) {
+                        cnt = sctp_copy_laddrs_to_user(sk, bp->port,
+                                                       &to, space_left);
+                        if (cnt < 0) {
+                                err = cnt;
+                                goto unlock;
+                        }
+                        goto copy_getaddrs;             
+                }
+        }
+
+        list_for_each(pos, &bp->address_list) {
+                addr = list_entry(pos, struct sctp_sockaddr_entry, 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;
+                if(space_left < addrlen)
+                        return -ENOMEM; /*fixme: right error?*/
+                temp.v4.sin_port = htons(temp.v4.sin_port);
+                if (copy_to_user(to, &temp, addrlen)) {
+                        err = -EFAULT;
+                        goto unlock;
+                }
+                to += addrlen;
+                cnt ++;
+                space_left -= addrlen;
+        }
+
+copy_getaddrs:
+        if (put_user(cnt, &((struct sctp_getaddrs __user *)optval)->addr_num))
+                return -EFAULT;
+        bytes_copied = ((char __user *)to) - optval;
+        if (put_user(bytes_copied, optlen))
+                return -EFAULT;
+
+unlock:
+        sctp_read_unlock(addr_lock);
+        return err;
+}
+
 /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
  *
  * Requests that the local SCTP stack use the enclosed peer address as
@@ -3807,12 +4001,20 @@ 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:
-                retval = sctp_getsockopt_peer_addrs_num(sk, len, optval,
+        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_NUM:
-                retval = sctp_getsockopt_local_addrs_num(sk, len, optval,
+        case SCTP_GET_LOCAL_ADDRS_OLD:
+                retval = sctp_getsockopt_local_addrs_old(sk, len, optval,
                                                          optlen);
                 break;
         case SCTP_GET_PEER_ADDRS:
diff --git a/net/sctp/ssnmap.c b/net/sctp/ssnmap.c
index 25037daf3fa0..cbe2513d2822 100644
--- a/net/sctp/ssnmap.c
+++ b/net/sctp/ssnmap.c
@@ -58,7 +58,7 @@ static inline size_t sctp_ssnmap_size(__u16 in, __u16 out)
  * Allocate room to store at least 'len' contiguous TSNs.
  */
 struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,
-                                    unsigned int __nocast gfp)
+                                    gfp_t gfp)
 {
         struct sctp_ssnmap *retval;
         int size;
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index d2f04ebe5081..6bc27200e6ca 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -57,7 +57,7 @@
 /* Initialize a new transport from provided memory.  */
 static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
                                                   const union sctp_addr *addr,
-                                                  unsigned int __nocast gfp)
+                                                  gfp_t gfp)
 {
         /* Copy in the address.  */
         peer->ipaddr = *addr;
@@ -122,7 +122,7 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
 
 /* Allocate and initialize a new transport.  */
 struct sctp_transport *sctp_transport_new(const union sctp_addr *addr,
-                                          unsigned int __nocast gfp)
+                                          gfp_t gfp)
 {
         struct sctp_transport *transport;
 
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index 0abd5101107c..057e7fac3af0 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -74,7 +74,7 @@ SCTP_STATIC void sctp_ulpevent_init(struct sctp_ulpevent *event, int msg_flags)
 
 /* Create a new sctp_ulpevent.  */
 SCTP_STATIC struct sctp_ulpevent *sctp_ulpevent_new(int size, int msg_flags,
-                                                    unsigned int __nocast gfp)
+                                                    gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sk_buff *skb;
@@ -136,7 +136,7 @@ static inline void sctp_ulpevent_release_owner(struct sctp_ulpevent *event)
 struct sctp_ulpevent  *sctp_ulpevent_make_assoc_change(
         const struct sctp_association *asoc,
         __u16 flags, __u16 state, __u16 error, __u16 outbound,
-        __u16 inbound, unsigned int __nocast gfp)
+        __u16 inbound, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_assoc_change *sac;
@@ -237,7 +237,7 @@ fail:
 struct sctp_ulpevent *sctp_ulpevent_make_peer_addr_change(
         const struct sctp_association *asoc,
         const struct sockaddr_storage *aaddr,
-        int flags, int state, int error, unsigned int __nocast gfp)
+        int flags, int state, int error, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_paddr_change  *spc;
@@ -350,7 +350,7 @@ fail:
  */
 struct sctp_ulpevent *sctp_ulpevent_make_remote_error(
         const struct sctp_association *asoc, struct sctp_chunk *chunk,
-        __u16 flags, unsigned int __nocast gfp)
+        __u16 flags, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_remote_error *sre;
@@ -448,7 +448,7 @@ fail:
  */
 struct sctp_ulpevent *sctp_ulpevent_make_send_failed(
         const struct sctp_association *asoc, struct sctp_chunk *chunk,
-        __u16 flags, __u32 error, unsigned int __nocast gfp)
+        __u16 flags, __u32 error, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_send_failed *ssf;
@@ -557,7 +557,7 @@ fail:
  */
 struct sctp_ulpevent *sctp_ulpevent_make_shutdown_event(
         const struct sctp_association *asoc,
-        __u16 flags, unsigned int __nocast gfp)
+        __u16 flags, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_shutdown_event *sse;
@@ -620,7 +620,7 @@ fail:
  * 5.3.1.6 SCTP_ADAPTION_INDICATION
  */
 struct sctp_ulpevent *sctp_ulpevent_make_adaption_indication(
-        const struct sctp_association *asoc, unsigned int __nocast gfp)
+        const struct sctp_association *asoc, gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_adaption_event *sai;
@@ -657,7 +657,7 @@ fail:
  */
 struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,
                                                 struct sctp_chunk *chunk,
-                                                unsigned int __nocast gfp)
+                                                gfp_t gfp)
 {
         struct sctp_ulpevent *event = NULL;
         struct sk_buff *skb;
@@ -719,7 +719,7 @@ fail:
  */
 struct sctp_ulpevent *sctp_ulpevent_make_pdapi(
         const struct sctp_association *asoc, __u32 indication,
-        unsigned int __nocast gfp)
+        gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_pdapi_event *pd;
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index ec2c857eae7f..2080b2d28c98 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -100,7 +100,7 @@ void sctp_ulpq_free(struct sctp_ulpq *ulpq)
 
 /* Process an incoming DATA chunk.  */
 int sctp_ulpq_tail_data(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
-                        unsigned int __nocast gfp)
+                        gfp_t gfp)
 {
         struct sk_buff_head temp;
         sctp_data_chunk_t *hdr;
@@ -792,7 +792,7 @@ static __u16 sctp_ulpq_renege_frags(struct sctp_ulpq *ulpq, __u16 needed)
 /* Partial deliver the first message as there is pressure on rwnd. */
 void sctp_ulpq_partial_delivery(struct sctp_ulpq *ulpq,
                                 struct sctp_chunk *chunk,
-                                unsigned int __nocast gfp)
+                                gfp_t gfp)
 {
         struct sctp_ulpevent *event;
         struct sctp_association *asoc;
@@ -816,7 +816,7 @@ void sctp_ulpq_partial_delivery(struct sctp_ulpq *ulpq,
 
 /* Renege some packets to make room for an incoming chunk.  */
 void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
-                      unsigned int __nocast gfp)
+                      gfp_t gfp)
 {
         struct sctp_association *asoc;
         __u16 needed, freed;
@@ -855,7 +855,7 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
 /* Notify the application if an association is aborted and in
  * partial delivery mode.  Send up any pending received messages.
  */
-void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, unsigned int __nocast gfp)
+void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)
 {
         struct sctp_ulpevent *ev = NULL;
         struct sock *sk;