Merge remote-tracking branch 'regulator/fix/of' into tmp

[linux-beck.git] / net / sctp / proc.c

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 9966e7b16451230319f63d601284281970226799..8c19e97262caf78fae564c09dd679dfc31e252f6 100644 (file)
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -139,7 +139,11 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
            primary = &peer->saddr;
        }
 
-       list_for_each_entry(laddr, &epb->bind_addr.address_list, list) {
+       rcu_read_lock();
+       list_for_each_entry_rcu(laddr, &epb->bind_addr.address_list, list) {
+               if (!laddr->valid)
+                       continue;
+
                addr = &laddr->a;
                af = sctp_get_af_specific(addr->sa.sa_family);
                if (primary && af->cmp_addr(addr, primary)) {
@@ -147,6 +151,7 @@ static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_commo
                }
                af->seq_dump_addr(seq, addr);
        }
+       rcu_read_unlock();
 }
 
 /* Dump remote addresses of an association. */
@@ -157,15 +162,20 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
        struct sctp_af *af;
 
        primary = &assoc->peer.primary_addr;
-       list_for_each_entry(transport, &assoc->peer.transport_addr_list,
+       rcu_read_lock();
+       list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list,
                        transports) {
                addr = &transport->ipaddr;
+               if (transport->dead)
+                       continue;
+
                af = sctp_get_af_specific(addr->sa.sa_family);
                if (af->cmp_addr(addr, primary)) {
                        seq_printf(seq, "*");
                }
                af->seq_dump_addr(seq, addr);
        }
+       rcu_read_unlock();
 }
 
 static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
@@ -436,12 +446,16 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
        head = &sctp_assoc_hashtable[hash];
        sctp_local_bh_disable();
        read_lock(&head->lock);
+       rcu_read_lock();
        sctp_for_each_hentry(epb, node, &head->chain) {
                if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))
                        continue;
                assoc = sctp_assoc(epb);
-               list_for_each_entry(tsp, &assoc->peer.transport_addr_list,
+               list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
                                        transports) {
+                       if (tsp->dead)
+                               continue;
+
                        /*
                         * The remote address (ADDR)
                         */
@@ -487,6 +501,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
                }
        }
 
+       rcu_read_unlock();
        read_unlock(&head->lock);
        sctp_local_bh_enable();