Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cdadcbc authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

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: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1f43763

include/net/sctp/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -638,9 +638,9 @@ static inline int sctp_phashfn(struct net *net, __u16 lport) 
}



/* This is the hash function for the endpoint hash table. */

static inline int sctp_ep_hashfn(__u16 lport)

static inline int sctp_ep_hashfn(struct net *net, __u16 lport)

{

	return lport & (sctp_ep_hashsize - 1);

	return (net_hash_mix(net) + lport) & (sctp_ep_hashsize - 1);

}



/* This is the hash function for the association hash table. */

include/net/sctp/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ struct sctp_association *sctp_endpoint_lookup_assoc( 
int sctp_endpoint_is_peeled_off(struct sctp_endpoint *,

				const union sctp_addr *);

struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *,

					const union sctp_addr *);

					struct net *, const union sctp_addr *);

int sctp_has_association(const union sctp_addr *laddr,

			 const union sctp_addr *paddr);

net/sctp/endpointola.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

net/sctp/input.c

+12 −7
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ static struct sctp_association *__sctp_rcv_lookup(struct sk_buff *skb, 
				      const union sctp_addr *laddr,

				      const union sctp_addr *paddr,

				      struct sctp_transport **transportp);

static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(const union sctp_addr *laddr);

static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(struct net *net,

						const union sctp_addr *laddr);

static struct sctp_association *__sctp_lookup_association(

					const union sctp_addr *local,

					const union sctp_addr *peer,
@@ -129,6 +130,7 @@ int sctp_rcv(struct sk_buff *skb) 
	union sctp_addr dest;

	int family;

	struct sctp_af *af;

	struct net *net = dev_net(skb->dev);



	if (skb->pkt_type!=PACKET_HOST)

		goto discard_it;
@@ -181,7 +183,7 @@ int sctp_rcv(struct sk_buff *skb) 
	asoc = __sctp_rcv_lookup(skb, &src, &dest, &transport);



	if (!asoc)

		ep = __sctp_rcv_lookup_endpoint(&dest);

		ep = __sctp_rcv_lookup_endpoint(net, &dest);



	/* Retrieve the common input handling substructure. */

	rcvr = asoc ? &asoc->base : &ep->base;
@@ -723,12 +725,13 @@ discard: 
/* Insert endpoint into the hash table.  */

static void __sctp_hash_endpoint(struct sctp_endpoint *ep)

{

	struct net *net = sock_net(ep->base.sk);

	struct sctp_ep_common *epb;

	struct sctp_hashbucket *head;



	epb = &ep->base;



	epb->hashent = sctp_ep_hashfn(epb->bind_addr.port);

	epb->hashent = sctp_ep_hashfn(net, epb->bind_addr.port);

	head = &sctp_ep_hashtable[epb->hashent];



	sctp_write_lock(&head->lock);
@@ -747,12 +750,13 @@ void sctp_hash_endpoint(struct sctp_endpoint *ep) 
/* Remove endpoint from the hash table.  */

static void __sctp_unhash_endpoint(struct sctp_endpoint *ep)

{

	struct net *net = sock_net(ep->base.sk);

	struct sctp_hashbucket *head;

	struct sctp_ep_common *epb;



	epb = &ep->base;



	epb->hashent = sctp_ep_hashfn(epb->bind_addr.port);

	epb->hashent = sctp_ep_hashfn(net, epb->bind_addr.port);



	head = &sctp_ep_hashtable[epb->hashent];
@@ -770,7 +774,8 @@ void sctp_unhash_endpoint(struct sctp_endpoint *ep) 
}



/* Look up an endpoint. */

static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(const union sctp_addr *laddr)

static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(struct net *net,

						const union sctp_addr *laddr)

{

	struct sctp_hashbucket *head;

	struct sctp_ep_common *epb;
@@ -778,12 +783,12 @@ static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(const union sctp_addr *l 
	struct hlist_node *node;

	int hash;



	hash = sctp_ep_hashfn(ntohs(laddr->v4.sin_port));

	hash = sctp_ep_hashfn(net, ntohs(laddr->v4.sin_port));

	head = &sctp_ep_hashtable[hash];

	read_lock(&head->lock);

	sctp_for_each_hentry(epb, node, &head->chain) {

		ep = sctp_ep(epb);

		if (sctp_endpoint_is_match(ep, laddr))

		if (sctp_endpoint_is_match(ep, net, laddr))

			goto hit;

	}