* [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses.
@ 2016-09-07 4:38 Lorenzo Colitti
2016-09-07 13:35 ` Eric Dumazet
2016-09-07 14:32 ` David Ahern
0 siblings, 2 replies; 3+ messages in thread
From: Lorenzo Colitti @ 2016-09-07 4:38 UTC (permalink / raw)
To: netdev; +Cc: ek, eric.dumazet, davem, dsa, Lorenzo Colitti
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: 5d77dca82839 ("net: diag: support SOCK_DESTROY for UDP sockets")
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
---
net/ipv4/udp_diag.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c
index 8a9f6e5..58b79c0 100644
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
@@ -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
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses.
2016-09-07 4:38 [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses Lorenzo Colitti
@ 2016-09-07 13:35 ` Eric Dumazet
2016-09-07 14:32 ` David Ahern
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2016-09-07 13:35 UTC (permalink / raw)
To: Lorenzo Colitti; +Cc: netdev, ek, davem, dsa
On Wed, 2016-09-07 at 13:38 +0900, Lorenzo Colitti wrote:
> 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: 5d77dca82839 ("net: diag: support SOCK_DESTROY for UDP sockets")
> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
> ---
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses.
2016-09-07 4:38 [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses Lorenzo Colitti
2016-09-07 13:35 ` Eric Dumazet
@ 2016-09-07 14:32 ` David Ahern
1 sibling, 0 replies; 3+ messages in thread
From: David Ahern @ 2016-09-07 14:32 UTC (permalink / raw)
To: Lorenzo Colitti, netdev; +Cc: ek, eric.dumazet, davem
On 9/6/16 10:38 PM, Lorenzo Colitti wrote:
> 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: 5d77dca82839 ("net: diag: support SOCK_DESTROY for UDP sockets")
> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
> ---
> net/ipv4/udp_diag.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by: David Ahern <dsa@cumulusnetworks.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-07 14:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-07 4:38 [PATCH net-next] net: diag: make udp_diag_destroy work for mapped addresses Lorenzo Colitti
2016-09-07 13:35 ` Eric Dumazet
2016-09-07 14:32 ` David Ahern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).