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

Commit 48aed1b0 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to ip_vs_has_real_service 



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 0a4fd6ce

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ struct ip_vs_service * 
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,

bool ip_vs_has_real_service(struct netns_ipvs *ipvs, int af, __u16 protocol,

			    const union nf_inet_addr *daddr, __be16 dport);



int ip_vs_use_count_inc(void);

net/netfilter/ipvs/ip_vs_core.c

+4 −2
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ static unsigned int 
ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)

{

	struct net *net = NULL;

	struct netns_ipvs *ipvs;

	struct ip_vs_iphdr iph;

	struct ip_vs_protocol *pp;

	struct ip_vs_proto_data *pd;
@@ -1211,7 +1212,8 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) 
		return NF_ACCEPT;



	net = skb_net(skb);

	if (!net_ipvs(net)->enable)

	ipvs = net_ipvs(net);

	if (!ipvs->enable)

		return NF_ACCEPT;



	ip_vs_fill_iph_skb(af, skb, false, &iph);
@@ -1269,7 +1271,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) 
					 sizeof(_ports), _ports, &iph);

		if (pptr == NULL)

			return NF_ACCEPT;	/* Not for me */

		if (ip_vs_has_real_service(net, af, iph.protocol, &iph.saddr,

		if (ip_vs_has_real_service(ipvs, af, iph.protocol, &iph.saddr,

					   pptr[0])) {

			/*

			 * Notify the real server: there is no

net/netfilter/ipvs/ip_vs_ctl.c

+1 −2
Original line number Diff line number Diff line
@@ -542,10 +542,9 @@ static void ip_vs_rs_unhash(struct ip_vs_dest *dest) 
}



/* Check if real service by <proto,addr,port> is present */

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

bool ip_vs_has_real_service(struct netns_ipvs *ipvs, int af, __u16 protocol,

			    const union nf_inet_addr *daddr, __be16 dport)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	unsigned int hash;

	struct ip_vs_dest *dest;