diff options
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index f6e288dc116e..ef29cfd936d3 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -158,9 +158,14 @@ static int tcp_v6_get_port(struct sock *sk, unsigned short snum) | |||
| 158 | tcp_port_rover = rover; | 158 | tcp_port_rover = rover; |
| 159 | spin_unlock(&tcp_portalloc_lock); | 159 | spin_unlock(&tcp_portalloc_lock); |
| 160 | 160 | ||
| 161 | /* Exhausted local port range during search? */ | 161 | /* Exhausted local port range during search? It is not |
| 162 | * possible for us to be holding one of the bind hash | ||
| 163 | * locks if this test triggers, because if 'remaining' | ||
| 164 | * drops to zero, we broke out of the do/while loop at | ||
| 165 | * the top level, not from the 'break;' statement. | ||
| 166 | */ | ||
| 162 | ret = 1; | 167 | ret = 1; |
| 163 | if (remaining <= 0) | 168 | if (unlikely(remaining <= 0)) |
| 164 | goto fail; | 169 | goto fail; |
| 165 | 170 | ||
| 166 | /* OK, here is the one we will use. */ | 171 | /* OK, here is the one we will use. */ |