sctp: the temp asoc's transports should not be hashed/unhashed

Re-establish the previous behavior and avoid hashing temporary asocs by
checking t->asoc->temp in sctp_(un)hash_transport. Also, remove the
check of t->asoc->temp in __sctp_lookup_association, since they are
never hashed now.

Fixes: 4f0087812648 ("sctp: apply rhashtable api to send/recv path")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Reported-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 52838eaa15821f5ea10eb67d78d7b9f6088bd1a6..2522a61752916b58b4a8f94d61e4d68068232d1b 100644 (file)
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -333,7 +333,7 @@ struct sctp_association *sctp_endpoint_lookup_assoc(
        if (!ep->base.bind_addr.port)
                goto out;
        t = sctp_epaddr_lookup_transport(ep, paddr);
-       if (!t || t->asoc->temp)
+       if (!t)
                goto out;
 
        *transport = t;

diff --git a/net/sctp/input.c b/net/sctp/input.c
index b9a536b52da2376e4c7133ec6c8820877f69479d..bf61dfb8e09eea1034c7b9ddd40583752033230c 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -874,6 +874,9 @@ void sctp_hash_transport(struct sctp_transport *t)
 {
        struct sctp_hash_cmp_arg arg;
 
+       if (t->asoc->temp)
+               return;
+
        arg.ep = t->asoc->ep;
        arg.paddr = &t->ipaddr;
        arg.net   = sock_net(t->asoc->base.sk);
@@ -886,6 +889,9 @@ reinsert:
 
 void sctp_unhash_transport(struct sctp_transport *t)
 {
+       if (t->asoc->temp)
+               return;
+
        rhashtable_remove_fast(&sctp_transport_hashtable, &t->node,
                               sctp_hash_params);
 }
@@ -931,7 +937,7 @@ static struct sctp_association *__sctp_lookup_association(
        struct sctp_transport *t;
 
        t = sctp_addrs_lookup_transport(net, local, peer);
-       if (!t || t->dead || t->asoc->temp)
+       if (!t || t->dead)
                return NULL;
 
        sctp_association_hold(t->asoc);