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

Commit e0aac52e authored by Simon Horman's avatar Simon Horman Committed by Pablo Neira Ayuso
Browse files

ipvs: fix matching of fwmark templates during scheduling 



	Commit f11017ec (2.6.37)
moved the fwmark variable in subcontext that is invalidated before
reaching the ip_vs_ct_in_get call. As vaddr is provided as pointer
in the param structure make sure the fwmark variable is in
same context. As the fwmark templates can not be matched,
more and more template connections are created and the
controlled connections can not go to single real server.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 29830406

net/netfilter/ipvs/ip_vs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, 
	__be16 dport = 0;		/* destination port to forward */

	unsigned int flags;

	struct ip_vs_conn_param param;

	const union nf_inet_addr fwmark = { .ip = htonl(svc->fwmark) };

	union nf_inet_addr snet;	/* source network of the client,

					   after masking */
@@ -267,7 +268,6 @@ ip_vs_sched_persist(struct ip_vs_service *svc, 
	{

		int protocol = iph.protocol;

		const union nf_inet_addr *vaddr = &iph.daddr;

		const union nf_inet_addr fwmark = { .ip = htonl(svc->fwmark) };

		__be16 vport = 0;



		if (dst_port == svc->port) {