OSDN Git Service

sctp: remove rcu_read_lock from sctp_bind_addr_state
authorXin Long <lucien.xin@gmail.com>
Mon, 8 Jul 2019 16:59:40 +0000 (00:59 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jul 2019 03:18:11 +0000 (20:18 -0700)
sctp_bind_addr_state() is called either in packet rcv path or
by sctp_copy_local_addr_list(), which are under rcu_read_lock.
So there's no need to call it again in sctp_bind_addr_state().

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/bind_addr.c

index f54333c..53bc615 100644 (file)
@@ -393,24 +393,19 @@ int sctp_bind_addr_state(const struct sctp_bind_addr *bp,
 {
        struct sctp_sockaddr_entry *laddr;
        struct sctp_af *af;
-       int state = -1;
 
        af = sctp_get_af_specific(addr->sa.sa_family);
        if (unlikely(!af))
-               return state;
+               return -1;
 
-       rcu_read_lock();
        list_for_each_entry_rcu(laddr, &bp->address_list, list) {
                if (!laddr->valid)
                        continue;
-               if (af->cmp_addr(&laddr->a, addr)) {
-                       state = laddr->state;
-                       break;
-               }
+               if (af->cmp_addr(&laddr->a, addr))
+                       return laddr->state;
        }
-       rcu_read_unlock();
 
-       return state;
+       return -1;
 }
 
 /* Find the first address in the bind address list that is not present in