aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNagendra Tomar <tomer_iisc@yahoo.com>2010-11-26 14:26:27 +0000
committerDavid S. Miller <davem@davemloft.net>2010-11-28 18:18:44 -0800
commitb4ff3c90e6066bacc8a92111752fe9e4f4c45cca (patch)
treeb64a78c4a7950e6b43c3e882dfc6dbe3a88aa2ea
parent5c7e57f7cddb83d81d83fefa5822dfe80891130e (diff)
downloadmrst-s0i3-test-b4ff3c90e6066bacc8a92111752fe9e4f4c45cca.tar.gz
mrst-s0i3-test-b4ff3c90e6066bacc8a92111752fe9e4f4c45cca.tar.xz
mrst-s0i3-test-b4ff3c90e6066bacc8a92111752fe9e4f4c45cca.zip
inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners
inet sockets corresponding to passive connections are added to the bind hash using ___inet_inherit_port(). These sockets are later removed from the bind hash using __inet_put_port(). These two functions are not exactly symmetrical. __inet_put_port() decrements hashinfo->bsockets and tb->num_owners, whereas ___inet_inherit_port() does not increment them. This results in both of these going to -ve values. This patch fixes this by calling inet_bind_hash() from ___inet_inherit_port(), which does the right thing. 'bsockets' and 'num_owners' were introduced by commit a9d8f9110d7e953c (inet: Allowing more than 64k connections and heavily optimize bind(0)) Signed-off-by: Nagendra Singh Tomar <tomer_iisc@yahoo.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/inet_hashtables.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 1b344f30b46..3c0369a3a66 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -133,8 +133,7 @@ int __inet_inherit_port(struct sock *sk, struct sock *child)
}
}
}
- sk_add_bind_node(child, &tb->owners);
- inet_csk(child)->icsk_bind_hash = tb;
+ inet_bind_hash(child, tb, port);
spin_unlock(&head->lock);
return 0;