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

Commit e0ba1a8a authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Amit Pundir
Browse files

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.

[backport of net-next f95bf346226b9b79352e05508beececc807cc37a]

Change-Id: I308f49786458a68eef0c61e6f8f3486cab8cbea6
Tested: https://android-review.googlesource.com/269874


Fixes: 5d77dca82839 ("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 de86a29b

net/ipv4/udp_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -183,8 +183,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);



		else