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

Commit 8f88ea68 authored by Alex Gartrell's avatar Alex Gartrell Committed by Simon Horman
Browse files

ipvs: support scheduling inverse and icmp TCP packets 



In the event of an icmp packet, take only the ports instead of trying to
grab the full header.

In the event of an inverse packet, use the source address and port.

Signed-off-by: default avatarAlex Gartrell <agartrell@fb.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 89621f31

net/netfilter/ipvs/ip_vs_proto_tcp.c

+28 −11
Original line number Diff line number Diff line
@@ -40,26 +40,43 @@ tcp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, 
	struct ip_vs_service *svc;

	struct tcphdr _tcph, *th;

	struct netns_ipvs *ipvs;

	__be16 _ports[2], *ports = NULL;



	if (ip_vs_iph_icmp(iph)) {

		/* TEMPORARY - do not schedule icmp yet */

		*verdict = NF_ACCEPT;

		return 0;

	}

	net = skb_net(skb);

	ipvs = net_ipvs(net);



	/* In the event of icmp, we're only guaranteed to have the first 8

	 * bytes of the transport header, so we only check the rest of the

	 * TCP packet for non-ICMP packets

	 */

	if (likely(!ip_vs_iph_icmp(iph))) {

		th = skb_header_pointer(skb, iph->len, sizeof(_tcph), &_tcph);

	if (th == NULL) {

		if (th) {

			if (th->rst || !(sysctl_sloppy_tcp(ipvs) || th->syn))

				return 1;

			ports = &th->source;

		}

	} else {

		ports = skb_header_pointer(

			skb, iph->len, sizeof(_ports), &_ports);

	}



	if (!ports) {

		*verdict = NF_DROP;

		return 0;

	}

	net = skb_net(skb);

	ipvs = net_ipvs(net);



	/* No !th->ack check to allow scheduling on SYN+ACK for Active FTP */

	rcu_read_lock();

	if ((th->syn || sysctl_sloppy_tcp(ipvs)) && !th->rst &&

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

				      &iph->daddr, th->dest))) {



	if (likely(!ip_vs_iph_inverse(iph)))

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

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

	else

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

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



	if (svc) {

		int ignored;



		if (ip_vs_todrop(ipvs)) {