Commit f95bf346 authored Sep 07, 2016 by Lorenzo Colitti Committed by David S. Miller Sep 07, 2016

net: diag: make udp_diag_destroy work for mapped addresses.

udp_diag_destroy does look up the IPv4 UDP hashtable for mapped
addresses, but it gets the IPv4 address to look up from the
beginning of the IPv6 address instead of the end.

Tested: https://android-review.googlesource.com/269874


Fixes: 5d77dca8 ("net: diag: support SOCK_DESTROY for UDP sockets")
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 733ade23

net/ipv4/udp_diag.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -186,8 +186,8 @@ static int __udp_diag_destroy(struct sk_buff *in_skb,
		if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) &&
		ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src))
		sk = __udp4_lib_lookup(net,
		req->id.idiag_dst[0], req->id.idiag_dport,
		req->id.idiag_src[0], req->id.idiag_sport,
		req->id.idiag_dst[3], req->id.idiag_dport,
		req->id.idiag_src[3], req->id.idiag_sport,
		req->id.idiag_if, tbl, NULL);

		else

Admin message