diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2012-08-06 08:40:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-08-14 22:44:12 -0700 |
| commit | 4cdadcbcb64bdf3ae8bdf3ef5bb2b91c85444cfa (patch) | |
| tree | fc6fd317dd6e128f176101c5843f58ed8ab86c9c /net/sctp/endpointola.c | |
| parent | sctp: Make the port hash table use struct net in it's key. (diff) | |
| download | linux-dev-4cdadcbcb64bdf3ae8bdf3ef5bb2b91c85444cfa.tar.xz linux-dev-4cdadcbcb64bdf3ae8bdf3ef5bb2b91c85444cfa.zip | |
sctp: Make the endpoint hashtable handle multiple network namespaces
- Use struct net in the hash calculation
- Use sock_net(endpoint.base.sk) in the endpoint lookups.
- On receive calculate the network namespace from skb->dev.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/endpointola.c')
| -rw-r--r-- | net/sctp/endpointola.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 68a385d7c3bd..50c87b4ad765 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -302,11 +302,13 @@ void sctp_endpoint_put(struct sctp_endpoint *ep) /* Is this the endpoint we are looking for? */ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep, + struct net *net, const union sctp_addr *laddr) { struct sctp_endpoint *retval = NULL; - if (htons(ep->base.bind_addr.port) == laddr->v4.sin_port) { + if ((htons(ep->base.bind_addr.port) == laddr->v4.sin_port) && + net_eq(sock_net(ep->base.sk), net)) { if (sctp_bind_addr_match(&ep->base.bind_addr, laddr, sctp_sk(ep->base.sk))) retval = ep; |