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

Commit 73e2d5e3 authored Nov 14, 2016 by Pablo Neira Committed by David S. Miller Nov 15, 2016

udp: restore UDPlite many-cast delivery

Honor udptable parameter that is passed to __udp*_lib_mcast_deliver(),
otherwise udplite broadcast/multicast use the wrong table and it breaks.

Fixes: 2dc41cff ("udp: Use hash2 for long hash1 chains in __udp*_lib_mcast_deliver.")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d0e3f65b

net/ipv4/udp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1652,10 +1652,10 @@ static int __udp4_lib_mcast_deliver(struct net net, struct sk_buff skb,

		if (use_hash2) {
		hash2_any = udp4_portaddr_hash(net, htonl(INADDR_ANY), hnum) &
		udp_table.mask;
		hash2 = udp4_portaddr_hash(net, daddr, hnum) & udp_table.mask;
		udptable->mask;
		hash2 = udp4_portaddr_hash(net, daddr, hnum) & udptable->mask;
		start_lookup:
		hslot = &udp_table.hash2[hash2];
		hslot = &udptable->hash2[hash2];
		offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);
		}

net/ipv6/udp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -706,10 +706,10 @@ static int __udp6_lib_mcast_deliver(struct net net, struct sk_buff skb,

		if (use_hash2) {
		hash2_any = udp6_portaddr_hash(net, &in6addr_any, hnum) &
		udp_table.mask;
		hash2 = udp6_portaddr_hash(net, daddr, hnum) & udp_table.mask;
		udptable->mask;
		hash2 = udp6_portaddr_hash(net, daddr, hnum) & udptable->mask;
		start_lookup:
		hslot = &udp_table.hash2[hash2];
		hslot = &udptable->hash2[hash2];
		offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);
		}