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

Commit cf34e646 authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: address family of LBLCR entry depends on svc family 



The LBLCR entries should use svc->af, not dest->af.
Needed to support svc->af != dest->af.

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

net/netfilter/ipvs/ip_vs_lblcr.c

+6 −6
Original line number Diff line number Diff line
@@ -362,18 +362,18 @@ ip_vs_lblcr_get(int af, struct ip_vs_lblcr_table *tbl, 
 */

static inline struct ip_vs_lblcr_entry *

ip_vs_lblcr_new(struct ip_vs_lblcr_table *tbl, const union nf_inet_addr *daddr,

		struct ip_vs_dest *dest)

		u16 af, struct ip_vs_dest *dest)

{

	struct ip_vs_lblcr_entry *en;



	en = ip_vs_lblcr_get(dest->af, tbl, daddr);

	en = ip_vs_lblcr_get(af, tbl, daddr);

	if (!en) {

		en = kmalloc(sizeof(*en), GFP_ATOMIC);

		if (!en)

			return NULL;



		en->af = dest->af;

		ip_vs_addr_copy(dest->af, &en->addr, daddr);

		en->af = af;

		ip_vs_addr_copy(af, &en->addr, daddr);

		en->lastuse = jiffies;



		/* initialize its dest set */
@@ -706,13 +706,13 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 
	/* If we fail to create a cache entry, we'll just use the valid dest */

	spin_lock_bh(&svc->sched_lock);

	if (!tbl->dead)

		ip_vs_lblcr_new(tbl, &iph->daddr, dest);

		ip_vs_lblcr_new(tbl, &iph->daddr, svc->af, dest);

	spin_unlock_bh(&svc->sched_lock);



out:

	IP_VS_DBG_BUF(6, "LBLCR: destination IP address %s --> server %s:%d\n",

		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),

		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));

		      IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port));



	return dest;

}