1 files changed, 94 insertions, 24 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 1e8132b8c4d9..bdd8bd428b64 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2746,6 +2746,46 @@ static int sctp_setsockopt_adaption_layer(struct sock *sk, char __user *optval,
         return 0;
 }
 
+/*
+ * 7.1.29.  Set or Get the default context (SCTP_CONTEXT)
+ *
+ * The context field in the sctp_sndrcvinfo structure is normally only
+ * used when a failed message is retrieved holding the value that was
+ * sent down on the actual send call.  This option allows the setting of
+ * a default context on an association basis that will be received on
+ * reading messages from the peer.  This is especially helpful in the
+ * one-2-many model for an application to keep some reference to an
+ * internal state machine that is processing messages on the
+ * association.  Note that the setting of this value only effects
+ * received messages from the peer and does not effect the value that is
+ * saved with outbound messages.
+ */
+static int sctp_setsockopt_context(struct sock *sk, char __user *optval,
+                                   int optlen)
+{
+        struct sctp_assoc_value params;
+        struct sctp_sock *sp;
+        struct sctp_association *asoc;
+
+        if (optlen != sizeof(struct sctp_assoc_value))
+                return -EINVAL;
+        if (copy_from_user(&params, optval, optlen))
+                return -EFAULT;
+
+        sp = sctp_sk(sk);
+
+        if (params.assoc_id != 0) {
+                asoc = sctp_id2assoc(sk, params.assoc_id);
+                if (!asoc)
+                        return -EINVAL;
+                asoc->default_rcv_context = params.assoc_value;
+        } else {
+                sp->default_rcv_context = params.assoc_value;
+        }
+
+        return 0;
+}
+
 /* API 6.2 setsockopt(), getsockopt()
  *
  * Applications use setsockopt() and getsockopt() to set or retrieve
@@ -2857,6 +2897,9 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
         case SCTP_ADAPTION_LAYER:
                 retval = sctp_setsockopt_adaption_layer(sk, optval, optlen);
                 break;
+        case SCTP_CONTEXT:
+                retval = sctp_setsockopt_context(sk, optval, optlen);
+                break;
 
         default:
                 retval = -ENOPROTOOPT;
@@ -3016,6 +3059,8 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
         sp->default_context = 0;
         sp->default_timetolive = 0;
 
+        sp->default_rcv_context = 0;
+
         /* Initialize default setup parameters. These parameters
          * can be modified with the SCTP_INITMSG socket option or
          * overridden by the SCTP_INIT CMSG.
@@ -3821,10 +3866,9 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
         sctp_assoc_t id;
         struct sctp_bind_addr *bp;
         struct sctp_association *asoc;
-        struct list_head *pos;
+        struct list_head *pos, *temp;
         struct sctp_sockaddr_entry *addr;
         rwlock_t *addr_lock;
-        unsigned long flags;
         int cnt = 0;
 
         if (len != sizeof(sctp_assoc_t))
@@ -3859,8 +3903,7 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
                 addr = list_entry(bp->address_list.next,
                                   struct sctp_sockaddr_entry, list);
                 if (sctp_is_any(&addr->a)) {
-                        sctp_spin_lock_irqsave(&sctp_local_addr_lock, flags);
-                        list_for_each(pos, &sctp_local_addr_list) {
+                        list_for_each_safe(pos, temp, &sctp_local_addr_list) {
                                 addr = list_entry(pos,
                                                   struct sctp_sockaddr_entry,
                                                   list);
@@ -3869,8 +3912,6 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len,
                                         continue;
                                 cnt++;
                         }
-                        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock,
-                                                    flags);
                 } else {
                         cnt = 1;
                 }
@@ -3892,15 +3933,13 @@ done:
 static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_addrs,
                                         void __user *to)
 {
-        struct list_head *pos;
+        struct list_head *pos, *next;
         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) {
+        list_for_each_safe(pos, next, &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))
@@ -3909,16 +3948,13 @@ static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_add
                 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 (copy_to_user(to, &temp, addrlen)) {
-                        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock,
-                                                    flags);
+                if (copy_to_user(to, &temp, addrlen))
                         return -EFAULT;
-                }
+
                 to += addrlen;
                 cnt ++;
                 if (cnt >= max_addrs) break;
         }
-        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock, flags);
 
         return cnt;
 }
@@ -3926,15 +3962,13 @@ static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_add
 static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port,
                                     void __user **to, size_t space_left)
 {
-        struct list_head *pos;
+        struct list_head *pos, *next;
         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) {
+        list_for_each_safe(pos, next, &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))
@@ -3945,16 +3979,13 @@ static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port,
                 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
                 if(space_left<addrlen)
                         return -ENOMEM;
-                if (copy_to_user(*to, &temp, addrlen)) {
-                        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock,
-                                                    flags);
+                if (copy_to_user(*to, &temp, addrlen))
                         return -EFAULT;
-                }
+
                 *to += addrlen;
                 cnt ++;
                 space_left -= addrlen;
         }
-        sctp_spin_unlock_irqrestore(&sctp_local_addr_lock, flags);
 
         return cnt;
 }
@@ -4435,6 +4466,42 @@ static int sctp_getsockopt_mappedv4(struct sock *sk, int len,
 }
 
 /*
+ * 7.1.29.  Set or Get the default context (SCTP_CONTEXT)
+ * (chapter and verse is quoted at sctp_setsockopt_context())
+ */
+static int sctp_getsockopt_context(struct sock *sk, int len,
+                                   char __user *optval, int __user *optlen)
+{
+        struct sctp_assoc_value params;
+        struct sctp_sock *sp;
+        struct sctp_association *asoc;
+
+        if (len != sizeof(struct sctp_assoc_value))
+                return -EINVAL;
+
+        if (copy_from_user(&params, optval, len))
+                return -EFAULT;
+
+        sp = sctp_sk(sk);
+
+        if (params.assoc_id != 0) {
+                asoc = sctp_id2assoc(sk, params.assoc_id);
+                if (!asoc)
+                        return -EINVAL;
+                params.assoc_value = asoc->default_rcv_context;
+        } else {
+                params.assoc_value = sp->default_rcv_context;
+        }
+
+        if (put_user(len, optlen))
+                return -EFAULT;
+        if (copy_to_user(optval, &params, len))
+                return -EFAULT;
+
+        return 0;
+}
+
+/*
  * 7.1.17 Set the maximum fragrmentation size (SCTP_MAXSEG)
  *
  * This socket option specifies the maximum size to put in any outgoing
@@ -4572,6 +4639,9 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
                 retval = sctp_getsockopt_adaption_layer(sk, len, optval,
                                                         optlen);
                 break;
+        case SCTP_CONTEXT:
+                retval = sctp_getsockopt_context(sk, len, optval, optlen);
+                break;
         default:
                 retval = -ENOPROTOOPT;
                 break;