korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 07:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: 4f00878126 ("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>
This commit is contained in:
Xin Long 2016-01-16 20:17:17 +08:00 committed by David S. Miller
parent 0b6e26ce89
commit dd7445ad6b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/sctp/endpointola.c
View File

@ -333,7 +333,7 @@ struct sctp_association *sctp_endpoint_lookup_assoc(
if (!ep->base.bind_addr.port) if (!ep->base.bind_addr.port)
goto out; goto out;
t = sctp_epaddr_lookup_transport(ep, paddr); t = sctp_epaddr_lookup_transport(ep, paddr);
if (!t || t->asoc->temp) if (!t)
goto out; goto out;
*transport = t; *transport = t;

8
net/sctp/input.c
View File

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