summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-12-22 11:42:26 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-22 11:42:26 -0800
commit5c668704b7fa5a4ebf21a490ddfbd6dc2e01fc97 (patch)
treea5b4ee5df56025c077646a2b8cbdf5a23c2a1b89 /net
parentb23e3536667373e44f52a907f63cb55f75969490 (diff)
downloadop-kernel-dev-5c668704b7fa5a4ebf21a490ddfbd6dc2e01fc97.zip
op-kernel-dev-5c668704b7fa5a4ebf21a490ddfbd6dc2e01fc97.tar.gz
[UDP]: Fix reversed logic in udp_get_port().
When this code was converted to use sk_for_each() the logic for the "best hash chain length" code was reversed, breaking everything. The original code was of the form: size = 0; do { if (++size >= best_size_so_far) goto next; } while ((sk = sk->next) != NULL); best_size_so_far = size; best = result; next:; and this got converted into: sk_for_each(sk2, node, head) if (++size < best_size_so_far) { best_size_so_far = size; best = result; } Which does something very very different from the original. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/udp.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 035915f..cfff930 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -165,11 +165,14 @@ int __udp_lib_get_port(struct sock *sk, unsigned short snum,
goto gotit;
}
size = 0;
- sk_for_each(sk2, node, head)
- if (++size < best_size_so_far) {
- best_size_so_far = size;
- best = result;
- }
+ sk_for_each(sk2, node, head) {
+ if (++size >= best_size_so_far)
+ goto next;
+ }
+ best_size_so_far = size;
+ best = result;
+ next:
+ ;
}
result = best;
for(i = 0; i < (1 << 16) / UDP_HTABLE_SIZE; i++, result += UDP_HTABLE_SIZE) {
OpenPOWER on IntegriCloud