Merge branch 'pxa-fixes'

[powerpc.git] / net / sctp / bind_addr.c

diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index 80294cb..6a7d010 100644 (file)
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -43,7 +43,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/in.h>
 #include <net/sock.h>
 #include <net/ipv6.h>
@@ -106,6 +105,32 @@ out:
        return error;
 }
 
+/* Exactly duplicate the address lists.  This is necessary when doing
+ * peer-offs and accepts.  We don't want to put all the current system
+ * addresses into the endpoint.  That's useless.  But we do want duplicat
+ * the list of bound addresses that the older endpoint used.
+ */
+int sctp_bind_addr_dup(struct sctp_bind_addr *dest,
+                       const struct sctp_bind_addr *src,
+                       gfp_t gfp)
+{
+       struct sctp_sockaddr_entry *addr;
+       struct list_head *pos;
+       int error = 0;
+
+       /* All addresses share the same port.  */
+       dest->port = src->port;
+
+       list_for_each(pos, &src->address_list) {
+               addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+               error = sctp_add_bind_addr(dest, &addr->a, 1, gfp);
+               if (error < 0)
+                       break;
+       }
+
+       return error;
+}
+
 /* Initialize the SCTP_bind_addr structure for either an endpoint or
  * an association.
  */
@@ -164,9 +189,15 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
                addr->a.v4.sin_port = htons(bp->port);
 
        addr->use_as_src = use_as_src;
+       addr->valid = 1;
 
        INIT_LIST_HEAD(&addr->list);
-       list_add_tail(&addr->list, &bp->address_list);
+       INIT_RCU_HEAD(&addr->rcu);
+
+       /* We always hold a socket lock when calling this function,
+        * and that acts as a writer synchronizing lock.
+        */
+       list_add_tail_rcu(&addr->list, &bp->address_list);
        SCTP_DBG_OBJCNT_INC(addr);
 
        return 0;
@@ -177,21 +208,26 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
  */
 int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr)
 {
-       struct list_head *pos, *temp;
-       struct sctp_sockaddr_entry *addr;
+       struct sctp_sockaddr_entry *addr, *temp;
 
-       list_for_each_safe(pos, temp, &bp->address_list) {
-               addr = list_entry(pos, struct sctp_sockaddr_entry, list);
+       /* We hold the socket lock when calling this function,
+        * and that acts as a writer synchronizing lock.
+        */
+       list_for_each_entry_safe(addr, temp, &bp->address_list, list) {
                if (sctp_cmp_addr_exact(&addr->a, del_addr)) {
                        /* Found the exact match. */
-                       list_del(pos);
-                       kfree(addr);
-                       SCTP_DBG_OBJCNT_DEC(addr);
-
-                       return 0;
+                       addr->valid = 0;
+                       list_del_rcu(&addr->list);
+                       break;
                }
        }
 
+       if (addr && !addr->valid) {
+               call_rcu(&addr->rcu, sctp_local_addr_free);
+               SCTP_DBG_OBJCNT_DEC(addr);
+               return 0;
+       }
+
        return -EINVAL;
 }
 
@@ -301,15 +337,20 @@ int sctp_bind_addr_match(struct sctp_bind_addr *bp,
                         struct sctp_sock *opt)
 {
        struct sctp_sockaddr_entry *laddr;
-       struct list_head *pos;
-
-       list_for_each(pos, &bp->address_list) {
-               laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
-               if (opt->pf->cmp_addr(&laddr->a, addr, opt))
-                       return 1;
+       int match = 0;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(laddr, &bp->address_list, list) {
+               if (!laddr->valid)
+                       continue;
+               if (opt->pf->cmp_addr(&laddr->a, addr, opt)) {
+                       match = 1;
+                       break;
+               }
        }
+       rcu_read_unlock();
 
-       return 0;
+       return match;
 }
 
 /* Find the first address in the bind address list that is not present in
@@ -324,18 +365,19 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr     *bp,
        union sctp_addr                 *addr;
        void                            *addr_buf;
        struct sctp_af                  *af;
-       struct list_head                *pos;
        int                             i;
 
-       list_for_each(pos, &bp->address_list) {
-               laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
-
+       /* This is only called sctp_send_asconf_del_ip() and we hold
+        * the socket lock in that code patch, so that address list
+        * can't change.
+        */
+       list_for_each_entry(laddr, &bp->address_list, list) {
                addr_buf = (union sctp_addr *)addrs;
                for (i = 0; i < addrcnt; i++) {
                        addr = (union sctp_addr *)addr_buf;
                        af = sctp_get_af_specific(addr->v4.sin_family);
                        if (!af)
-                               return NULL;
+                               break;
 
                        if (opt->pf->cmp_addr(&laddr->a, addr, opt))
                                break;