diff options
Diffstat (limited to 'net/ipv4/inet_diag.c')
| -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 8bb8e7ad8548..6029157a19ed 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, | |||
| 361 | req->id.idiag_dport, req->id.idiag_src[0], | 361 | req->id.idiag_dport, req->id.idiag_src[0], |
| 362 | req->id.idiag_sport, req->id.idiag_if); | 362 | req->id.idiag_sport, req->id.idiag_if); |
| 363 | #if IS_ENABLED(CONFIG_IPV6) | 363 | #if IS_ENABLED(CONFIG_IPV6) |
| 364 | else if (req->sdiag_family == AF_INET6) | 364 | else if (req->sdiag_family == AF_INET6) { |
| 365 | sk = inet6_lookup(net, hashinfo, | 365 | if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) && |
| 366 | (struct in6_addr *)req->id.idiag_dst, | 366 | ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src)) |
| 367 | req->id.idiag_dport, | 367 | sk = inet_lookup(net, hashinfo, req->id.idiag_dst[3], |
| 368 | (struct in6_addr *)req->id.idiag_src, | 368 | req->id.idiag_dport, req->id.idiag_src[3], |
| 369 | req->id.idiag_sport, | 369 | req->id.idiag_sport, req->id.idiag_if); |
| 370 | req->id.idiag_if); | 370 | else |
| 371 | sk = inet6_lookup(net, hashinfo, | ||
| 372 | (struct in6_addr *)req->id.idiag_dst, | ||
| 373 | req->id.idiag_dport, | ||
| 374 | (struct in6_addr *)req->id.idiag_src, | ||
| 375 | req->id.idiag_sport, | ||
| 376 | req->id.idiag_if); | ||
| 377 | } | ||
| 371 | #endif | 378 | #endif |
| 372 | else | 379 | else |
| 373 | return ERR_PTR(-EINVAL); | 380 | return ERR_PTR(-EINVAL); |