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

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

ipvs: Pass ipvs into conn_out_get 



Move the hack of relying on "net_ipvs(skb_net(skb))" to derive the
ipvs up a layer.

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 ab161976

include/net/ip_vs.h

+4 −2
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ struct ip_vs_protocol { 
		       const struct ip_vs_iphdr *iph);



	struct ip_vs_conn *

	(*conn_out_get)(int af,

	(*conn_out_get)(struct netns_ipvs *ipvs,

			int af,

			const struct sk_buff *skb,

			const struct ip_vs_iphdr *iph);
@@ -1229,7 +1230,8 @@ struct ip_vs_conn * ip_vs_conn_in_get_proto(struct netns_ipvs *ipvs, int af, 


struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p);



struct ip_vs_conn * ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,

struct ip_vs_conn * ip_vs_conn_out_get_proto(struct netns_ipvs *ipvs, int af,

					     const struct sk_buff *skb,

					     const struct ip_vs_iphdr *iph);



/* Get reference to gain full access to conn.

net/netfilter/ipvs/ip_vs_conn.c

+2 −2
Original line number Diff line number Diff line
@@ -440,10 +440,10 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p) 
}



struct ip_vs_conn *

ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,

ip_vs_conn_out_get_proto(struct netns_ipvs *ipvs, int af,

			 const struct sk_buff *skb,

			 const struct ip_vs_iphdr *iph)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct ip_vs_conn_param p;



	if (ip_vs_conn_fill_param_proto(ipvs, af, skb, iph, &p))

net/netfilter/ipvs/ip_vs_core.c

+5 −3
Original line number Diff line number Diff line
@@ -912,6 +912,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb, 
static int ip_vs_out_icmp(struct sk_buff *skb, int *related,

			  unsigned int hooknum)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct iphdr *iph;

	struct icmphdr	_icmph, *ic;

	struct iphdr	_ciph, *cih;	/* The ip header contained within the ICMP */
@@ -974,7 +975,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, 
	ip_vs_fill_iph_skb_icmp(AF_INET, skb, offset, true, &ciph);



	/* The embedded headers contain source and dest in reverse order */

	cp = pp->conn_out_get(AF_INET, skb, &ciph);

	cp = pp->conn_out_get(ipvs, AF_INET, skb, &ciph);

	if (!cp)

		return NF_ACCEPT;
@@ -987,6 +988,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, 
static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related,

			     unsigned int hooknum, struct ip_vs_iphdr *ipvsh)

{

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));

	struct icmp6hdr	_icmph, *ic;

	struct ip_vs_iphdr ciph = {.flags = 0, .fragoffs = 0};/*Contained IP */

	struct ip_vs_conn *cp;
@@ -1029,7 +1031,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related, 
		return NF_ACCEPT;



	/* The embedded headers contain source and dest in reverse order */

	cp = pp->conn_out_get(AF_INET6, skb, &ciph);

	cp = pp->conn_out_get(ipvs, AF_INET6, skb, &ciph);

	if (!cp)

		return NF_ACCEPT;
@@ -1257,7 +1259,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) 
	/*

	 * Check if the packet belongs to an existing entry

	 */

	cp = pp->conn_out_get(af, skb, &iph);

	cp = pp->conn_out_get(ipvs, af, skb, &iph);



	if (likely(cp))

		return handle_response(af, skb, pd, cp, &iph, hooknum);

net/netfilter/ipvs/ip_vs_proto_ah_esp.c

+1 −2
Original line number Diff line number Diff line
@@ -82,12 +82,11 @@ ah_esp_conn_in_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb, 




static struct ip_vs_conn *

ah_esp_conn_out_get(int af, const struct sk_buff *skb,

ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb,

		    const struct ip_vs_iphdr *iph)

{

	struct ip_vs_conn *cp;

	struct ip_vs_conn_param p;

	struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));



	ah_esp_conn_fill_param_proto(ipvs, af, iph, &p);

	cp = ip_vs_conn_out_get(&p);

net/netfilter/xt_ipvs.c

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static bool 
ipvs_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct xt_ipvs_mtinfo *data = par->matchinfo;

	struct netns_ipvs *ipvs = net_ipvs(par->net);

	/* ipvs_mt_check ensures that family is only NFPROTO_IPV[46]. */

	const u_int8_t family = par->family;

	struct ip_vs_iphdr iph;
@@ -85,7 +86,7 @@ ipvs_mt(const struct sk_buff *skb, struct xt_action_param *par) 
	/*

	 * Check if the packet belongs to an existing entry

	 */

	cp = pp->conn_out_get(family, skb, &iph);

	cp = pp->conn_out_get(ipvs, family, skb, &iph);

	if (unlikely(cp == NULL)) {

		match = false;

		goto out;