diff options
Diffstat (limited to 'net/ipv4/inet_diag.c')
-rw-r--r-- | net/ipv4/inet_diag.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 6029157a19ed..5fdb02f5598e 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
@@ -357,18 +357,18 @@ struct sock *inet_diag_find_one_icsk(struct net *net, | |||
357 | struct sock *sk; | 357 | struct sock *sk; |
358 | 358 | ||
359 | if (req->sdiag_family == AF_INET) | 359 | if (req->sdiag_family == AF_INET) |
360 | sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0], | 360 | sk = inet_lookup(net, hashinfo, NULL, 0, req->id.idiag_dst[0], |
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 | if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) && | 365 | if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) && |
366 | ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src)) | 366 | ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src)) |
367 | sk = inet_lookup(net, hashinfo, req->id.idiag_dst[3], | 367 | sk = inet_lookup(net, hashinfo, NULL, 0, req->id.idiag_dst[3], |
368 | req->id.idiag_dport, req->id.idiag_src[3], | 368 | req->id.idiag_dport, req->id.idiag_src[3], |
369 | req->id.idiag_sport, req->id.idiag_if); | 369 | req->id.idiag_sport, req->id.idiag_if); |
370 | else | 370 | else |
371 | sk = inet6_lookup(net, hashinfo, | 371 | sk = inet6_lookup(net, hashinfo, NULL, 0, |
372 | (struct in6_addr *)req->id.idiag_dst, | 372 | (struct in6_addr *)req->id.idiag_dst, |
373 | req->id.idiag_dport, | 373 | req->id.idiag_dport, |
374 | (struct in6_addr *)req->id.idiag_src, | 374 | (struct in6_addr *)req->id.idiag_src, |
@@ -879,6 +879,7 @@ next_normal: | |||
879 | } | 879 | } |
880 | 880 | ||
881 | spin_unlock_bh(lock); | 881 | spin_unlock_bh(lock); |
882 | cond_resched(); | ||
882 | } | 883 | } |
883 | 884 | ||
884 | done: | 885 | done: |