diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-01-20 16:25:01 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-09-10 16:51:11 +0200 |
| commit | 48e1aa52d436f2fb469abf1987accc058cc0516a (patch) | |
| tree | b53692e75b69f08d69d1d680f62ef2c342f7f3fc /net/ipv4 | |
| parent | 2efad8609aa23ebda29079f0c5a66ee2cd1c70af (diff) | |
net: diag: support v4mapped sockets in inet_diag_find_one_icsk()
Lorenzo reported that we could not properly find v4mapped sockets
in inet_diag_find_one_icsk(). This patch fixes the issue.
[Cherry-pick of net 7c1306723ee916ea9f1fa7d9e4c7a6d029ca7aaf]
Change-Id: If71ddbc2f082e708e5fa9d60f5c08702a09e2884
Reported-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/inet_diag.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 48af14528..a897652c6 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -317,12 +317,18 @@ struct sock *inet_diag_find_one_icsk(struct net *net, } #if IS_ENABLED(CONFIG_IPV6) else if (req->sdiag_family == AF_INET6) { - sk = inet6_lookup(net, hashinfo, - (struct in6_addr *)req->id.idiag_dst, - req->id.idiag_dport, - (struct in6_addr *)req->id.idiag_src, - req->id.idiag_sport, - req->id.idiag_if); + if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) && + ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src)) + sk = inet_lookup(net, hashinfo, req->id.idiag_dst[3], + req->id.idiag_dport, req->id.idiag_src[3], + req->id.idiag_sport, req->id.idiag_if); + else + sk = inet6_lookup(net, hashinfo, + (struct in6_addr *)req->id.idiag_dst, + req->id.idiag_dport, + (struct in6_addr *)req->id.idiag_src, + req->id.idiag_sport, + req->id.idiag_if); } #endif else { |