]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
sctp: call rcu_read_lock before checking for duplicate transport nodes
authorXin Long <lucien.xin@gmail.com>
Tue, 28 Feb 2017 04:41:29 +0000 (12:41 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Mar 2017 17:50:58 +0000 (09:50 -0800)
Commit cd2b70875058 ("sctp: check duplicate node before inserting a
new transport") called rhltable_lookup() to check for the duplicate
transport node in transport rhashtable.

But rhltable_lookup() doesn't call rcu_read_lock inside, it could cause
a use-after-free issue if it tries to dereference the node that another
cpu has freed it. Note that sock lock can not avoid this as it is per
sock.

This patch is to fix it by calling rcu_read_lock before checking for
duplicate transport nodes.

Fixes: cd2b70875058 ("sctp: check duplicate node before inserting a new transport")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/input.c

index fc458968fe4bd818dc9b6475ffa0db07b830d43a..2a28ab20487f03f61ed8d74cb511bce2973ce242 100644 (file)
@@ -884,14 +884,17 @@ int sctp_hash_transport(struct sctp_transport *t)
        arg.paddr = &t->ipaddr;
        arg.lport = htons(t->asoc->base.bind_addr.port);
 
+       rcu_read_lock();
        list = rhltable_lookup(&sctp_transport_hashtable, &arg,
                               sctp_hash_params);
 
        rhl_for_each_entry_rcu(transport, tmp, list, node)
                if (transport->asoc->ep == t->asoc->ep) {
+                       rcu_read_unlock();
                        err = -EEXIST;
                        goto out;
                }
+       rcu_read_unlock();
 
        err = rhltable_insert_key(&sctp_transport_hashtable, &arg,
                                  &t->node, sctp_hash_params);