diff options
| author |   Eric Dumazet <edumazet@google.com> | 2016-04-09 08:01:13 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-09 16:53:52 -0400 |
| commit | 03c5b534185f9844c1b5fcfdbae2adc32821ec42 (patch) | |
| tree | 1af4a44323cfd4664bb530b1dc7587fa41393960 /net/ipv6/inet6_hashtables.c | |
| parent | ibmvnic: Enable use of multiple tx/rx scrqs (diff) | |
| download | linux-dev-03c5b534185f9844c1b5fcfdbae2adc32821ec42.tar.xz linux-dev-03c5b534185f9844c1b5fcfdbae2adc32821ec42.zip | |
ipv6: fix inet6_lookup_listener()
A stupid refactoring bug in inet6_lookup_listener() needs to be fixed
in order to get proper SO_REUSEPORT behavior.
Fixes: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/inet6_hashtables.c')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 607da088344d..f1678388fb0d 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -137,7 +137,7 @@ struct sock *inet6_lookup_listener(struct net *net, sk_for_each(sk, &ilb->head) { score = compute_score(sk, net, hnum, daddr, dif); if (score > hiscore) { - hiscore = score; + reuseport = sk->sk_reuseport; if (reuseport) { phash = inet6_ehashfn(net, daddr, hnum, saddr, sport); @@ -148,7 +148,7 @@ struct sock *inet6_lookup_listener(struct net *net, matches = 1; } result = sk; - reuseport = sk->sk_reuseport; + hiscore = score; } else if (score == hiscore && reuseport) { matches++; if (reciprocal_scale(phash, matches) == 0) |