diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-01-20 16:25:01 -0800 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-07-20 16:18:26 +0200 |
| commit | da724945812bf76858cdbba3129ffa43619c15f6 (patch) | |
| tree | 6c84812cc2b43c24ac3d8c44419c2a5db9404580 | |
| parent | c0d437561a690458921d281a1ce967fcac94c019 (diff) | |
| download | v4.4-da724945812bf76858cdbba3129ffa43619c15f6.tar.gz | |
UPSTREAM: 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 fc439d9489479411fbf9bbbec2c768df89e85503]
Reported-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Bug: None
Patchset: net-diag-socket-destroy
Signed-off-by: Mattias Nissler <mnissler@google.com>
Change-Id: Ib943434c45e1afd61c435d5cc8398bb990ac28eb
| -rw-r--r-- | net/ipv4/inet_diag.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 27c5fd5747d8..a403a676d452 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -361,13 +361,20 @@ struct sock *inet_diag_find_one_icsk(struct net *net, req->id.idiag_dport, req->id.idiag_src[0], req->id.idiag_sport, req->id.idiag_if); #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); + else if (req->sdiag_family == AF_INET6) { + 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 return ERR_PTR(-EINVAL); |