linux/net/netfilter/ipvs, branch v3.18

ipvs: Keep skb->sk when allocating headroom on tunnel xmit

2014-11-12T02:03:04Z

ip_vs_prepare_tunneled_skb() ignores ->sk when allocating a new skb, either unconditionally setting ->sk to NULL or allowing the uninitialized ->sk from a newly allocated skb to leak through to the caller. This patch properly copies ->sk and increments its reference count. Signed-off-by: Calvin Owens Acked-by: Julian Anastasov Signed-off-by: Simon Horman

ipvs: Avoid null-pointer deref in debug code

2014-10-28T00:48:31Z

Use daddr instead of reaching into dest. Reported-by: Dan Carpenter Signed-off-by: Alex Gartrell Signed-off-by: Simon Horman

netfilter: replace strnicmp with strncasecmp

2014-10-14T00:18:24Z

The kernel used to contain two functions for length-delimited, case-insensitive string comparison, strnicmp with correct semantics and a slightly buggy strncasecmp. The latter is the POSIX name, so strnicmp was renamed to strncasecmp, and strnicmp made into a wrapper for the new strncasecmp to avoid breaking existing users. To allow the compat wrapper strnicmp to be removed at some point in the future, and to avoid the extra indirection cost, do s/strnicmp/strncasecmp/g. Signed-off-by: Rasmus Villemoes Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

ipvs: Allow heterogeneous pools now that we support them

2014-09-17T23:59:29Z

Remove the temporary consistency check and add a case statement to only allow ipip mixed dests. Signed-off-by: Alex Gartrell Acked-by: Julian Anastasov Signed-off-by: Simon Horman

ipvs: use the new dest addr family field

2014-09-17T23:59:28Z

Use the new address family field cp->daf when printing cp->daddr in logs or connection listing. Signed-off-by: Julian Anastasov Signed-off-by: Alex Gartrell Signed-off-by: Simon Horman

ipvs: use correct address family in scheduler logs

2014-09-17T23:59:23Z

Needed to support svc->af != dest->af. Signed-off-by: Julian Anastasov Signed-off-by: Alex Gartrell Signed-off-by: Simon Horman

ipvs: address family of LBLCR entry depends on svc family

2014-09-16T00:03:38Z

The LBLCR entries should use svc->af, not dest->af. Needed to support svc->af != dest->af. Signed-off-by: Julian Anastasov Signed-off-by: Alex Gartrell Signed-off-by: Simon Horman

ipvs: address family of LBLC entry depends on svc family

2014-09-16T00:03:38Z

The LBLC entries should use svc->af, not dest->af. Needed to support svc->af != dest->af. Signed-off-by: Julian Anastasov Signed-off-by: Alex Gartrell Signed-off-by: Simon Horman

ipvs: support ipv4 in ipv6 and ipv6 in ipv4 tunnel forwarding

2014-09-16T00:03:37Z

Pull the common logic for preparing an skb to prepend the header into a single function and then set fields such that they can be used in either case (generalize tos and tclass to dscp, hop_limit and ttl to ttl, etc) Signed-off-by: Alex Gartrell Acked-by: Julian Anastasov Signed-off-by: Simon Horman

ipvs: Add generic ensure_mtu_is_adequate to handle mixed pools

2014-09-16T00:03:37Z

The out_rt functions check to see if the mtu is large enough for the packet and, if not, send icmp messages (TOOBIG or DEST_UNREACH) to the source and bail out. We needed the ability to send ICMP from the out_rt_v6 function and DEST_UNREACH from the out_rt function, so we just pulled it out into a common function. Signed-off-by: Alex Gartrell Acked-by: Julian Anastasov Signed-off-by: Simon Horman