diff options
| author | Xin Long <lucien.xin@gmail.com> | 2016-01-16 20:17:17 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-17 19:11:44 -0500 |
| commit | dd7445ad6be3809565272b0e724f2f00c2de1989 (patch) | |
| tree | 2362c43a03fcaa7981fd19b41c1c9bc86e02d5fc /net | |
| parent | 0b6e26ce89391327d955a756a7823272238eb867 (diff) | |
| download | linux-dd7445ad6be3809565272b0e724f2f00c2de1989.tar.gz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/endpointola.c | 2 | ||||
| -rw-r--r-- | net/sctp/input.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 52838eaa1582..2522a6175291 100644 --- 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 b9a536b52da2..bf61dfb8e09e 100644 --- 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); |