: Unhash sockets correctly
Subsystems (2)
PATCH 1/1 : Unhash sockets correctly
Hi Dave,
this patch fixes a nasty bug introduced by the pid-hash backport. Sockets are only unhashed if they are contained in the first hash bucket. This leads to leaking sockets and, over time, to bind conflicts which confuse iproute and result in sporadic failure.
Regards
Patrick
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/02/16 19:32:38+01:00 [email protected]
# [NETLINK]: Unhash sockets correctly
#
# netlink_remove() only unhashes sockets contained in the # first hash bucket. This leads to leaking sockets and, # over time, to bind conflicts which confuse iproute. # # Signed-off-by: Patrick McHardy <[email protected]> # # net/netlink/af_netlink.c # 2005/02/16 19:32:36+01:00 [email protected] +2 -1 # [NETLINK]: Unhash sockets correctly # # netlink_remove() only unhashes sockets contained in the # first hash bucket. This leads to leaking sockets and, # over time, to bind conflicts which confuse iproute. # # Signed-off-by: Patrick McHardy <[email protected]> # diff -Nru a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c 2005-02-16 19:32:51 +01:00 +++ b/net/netlink/af_netlink.c 2005-02-16 19:32:51 +01:00 @@ -327,10 +327,11 @@ struct sock **skp; struct netlink_table *table = &nl_table[sk->protocol]; struct nl_pid_hash *hash = &table->hash; + u32 pid = nlk_sk(sk)->pid;
netlink_table_grab();
hash->entries--;
- for (skp = hash->table; *skp; skp = &((*skp)->next)) {
+ for (skp = nl_pid_hashfn(hash, pid); *skp; skp = &((*skp)->next)) {
if (*skp == sk) {
*skp = sk->next;
__sock_put(sk);
David S. Miller
maintainerQuoted 4 lines · On Wed, 16 Feb 2005 19:54:17 +0100 Patrick McHardy <[email protected]> wrote:
this patch fixes a nasty bug introduced by the pid-hash backport. Sockets are only unhashed if they are contained in the first hash bucket. This leads to leaking sockets and, over time, to bind conflicts which confuse iproute and result in sporadic failure.
Good catch Patrick. Applied, and I'll push upstream momentarily.