Commit f95bf346 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by David S. Miller

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: default avatarLorenzo Colitti <lorenzo@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 733ade23
...@@ -186,8 +186,8 @@ static int __udp_diag_destroy(struct sk_buff *in_skb, ...@@ -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) && if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) &&
ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src)) ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src))
sk = __udp4_lib_lookup(net, sk = __udp4_lib_lookup(net,
req->id.idiag_dst[0], req->id.idiag_dport, req->id.idiag_dst[3], req->id.idiag_dport,
req->id.idiag_src[0], req->id.idiag_sport, req->id.idiag_src[3], req->id.idiag_sport,
req->id.idiag_if, tbl, NULL); req->id.idiag_if, tbl, NULL);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment