Commit 0a4fd6ce authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to ip_vs_service_find 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent bb2e2a8c

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ extern struct ip_vs_stats ip_vs_stats; 
extern int sysctl_ip_vs_sync_ver;



struct ip_vs_service *

ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,

ip_vs_service_find(struct netns_ipvs *ipvs, int af, __u32 fwmark, __u16 protocol,

		  const union nf_inet_addr *vaddr, __be16 vport);



bool ip_vs_has_real_service(struct net *net, int af, __u16 protocol,

net/netfilter/ipvs/ip_vs_ctl.c

+2 −3
Original line number Diff line number Diff line
@@ -406,11 +406,10 @@ __ip_vs_svc_fwm_find(struct netns_ipvs *ipvs, int af, __u32 fwmark) 


/* Find service, called under RCU lock */

struct ip_vs_service *

ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,

ip_vs_service_find(struct netns_ipvs *ipvs, int af, __u32 fwmark, __u16 protocol,

		   const union nf_inet_addr *vaddr, __be16 vport)

{

	struct ip_vs_service *svc;

	struct netns_ipvs *ipvs = net_ipvs(net);



	/*

	 *	Check the table hashed by fwmark first
@@ -612,7 +611,7 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int svc_af, int dest_af, 
	struct ip_vs_service *svc;

	__be16 port = dport;



	svc = ip_vs_service_find(net, svc_af, fwmark, protocol, vaddr, vport);

	svc = ip_vs_service_find(net_ipvs(net), svc_af, fwmark, protocol, vaddr, vport);

	if (!svc)

		return NULL;

	if (fwmark && (flags & IP_VS_CONN_F_FWD_MASK) != IP_VS_CONN_F_MASQ)

net/netfilter/ipvs/ip_vs_proto_sctp.c

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 


	rcu_read_lock();

	if (likely(!ip_vs_iph_inverse(iph)))

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->daddr, ports[1]);

	else

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->saddr, ports[0]);

	if (svc) {

		int ignored;

net/netfilter/ipvs/ip_vs_proto_tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ tcp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
	rcu_read_lock();



	if (likely(!ip_vs_iph_inverse(iph)))

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->daddr, ports[1]);

	else

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->saddr, ports[0]);



	if (svc) {

net/netfilter/ipvs/ip_vs_proto_udp.c

+4 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
		  struct ip_vs_iphdr *iph)

{

	struct net *net;

	struct netns_ipvs *ipvs;

	struct ip_vs_service *svc;

	struct udphdr _udph, *uh;

	__be16 _ports[2], *ports = NULL;
@@ -54,12 +55,13 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
	}



	net = skb_net(skb);

	ipvs = net_ipvs(net);

	rcu_read_lock();

	if (likely(!ip_vs_iph_inverse(iph)))

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->daddr, ports[1]);

	else

		svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,

		svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,

					 &iph->saddr, ports[0]);



	if (svc) {