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

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

ipvs: fix hashing in ip_vs_svc_hashkey 



net is a pointer in host order, mix it properly
with other keys in network order. Fixes sparse warning.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 1cdb0905

net/netfilter/ipvs/ip_vs_ctl.c

+5 −3
Original line number Diff line number Diff line
@@ -271,16 +271,18 @@ ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto, 
{

	register unsigned int porth = ntohs(port);

	__be32 addr_fold = addr->ip;

	__u32 ahash;



#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		addr_fold = addr->ip6[0]^addr->ip6[1]^

			    addr->ip6[2]^addr->ip6[3];

#endif

	addr_fold ^= ((size_t)net>>8);

	ahash = ntohl(addr_fold);

	ahash ^= ((size_t) net >> 8);



	return (proto^ntohl(addr_fold)^(porth>>IP_VS_SVC_TAB_BITS)^porth)

		& IP_VS_SVC_TAB_MASK;

	return (proto ^ ahash ^ (porth >> IP_VS_SVC_TAB_BITS) ^ porth) &

	       IP_VS_SVC_TAB_MASK;

}



/*