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

Commit b9901a84 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETNS][DCCPV4]: Make per-net socket lookup. 



The inet_lookup family of functions requires a net to lookup
a socket in, so give a proper one to them.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5487398

net/dccp/ipv4.c

+5 −4
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
		return;

	}



	sk = inet_lookup(&init_net, &dccp_hashinfo, iph->daddr, dh->dccph_dport,

	sk = inet_lookup(dev_net(skb->dev), &dccp_hashinfo,

			iph->daddr, dh->dccph_dport,

			iph->saddr, dh->dccph_sport, inet_iif(skb));

	if (sk == NULL) {

		ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
@@ -429,7 +430,7 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 
	if (req != NULL)

		return dccp_check_req(sk, skb, req, prev);



	nsk = inet_lookup_established(&init_net, &dccp_hashinfo,

	nsk = inet_lookup_established(sock_net(sk), &dccp_hashinfo,

				      iph->saddr, dh->dccph_sport,

				      iph->daddr, dh->dccph_dport,

				      inet_iif(skb));
@@ -810,7 +811,7 @@ static int dccp_v4_rcv(struct sk_buff *skb) 


	/* Step 2:

	 *	Look up flow ID in table and get corresponding socket */

	sk = __inet_lookup(&init_net, &dccp_hashinfo,

	sk = __inet_lookup(dev_net(skb->dst->dev), &dccp_hashinfo,

			   iph->saddr, dh->dccph_sport,

			   iph->daddr, dh->dccph_dport, inet_iif(skb));

	/*