提交 9faa89d4 编写于 作者: J Jon Maloy 提交者: David S. Miller

tipc: make function tipc_net_finalize() thread safe

The setting of the node address is not thread safe, meaning that
two discoverers may decide to set it simultanously, with a duplicate
entry in the name table as result. We fix that with this commit.

Fixes: 25b0b9c4 ("tipc: handle collisions of 32-bit node address hash values")
Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 92018c7c
...@@ -121,12 +121,17 @@ int tipc_net_init(struct net *net, u8 *node_id, u32 addr) ...@@ -121,12 +121,17 @@ int tipc_net_init(struct net *net, u8 *node_id, u32 addr)
void tipc_net_finalize(struct net *net, u32 addr) void tipc_net_finalize(struct net *net, u32 addr)
{ {
tipc_set_node_addr(net, addr); struct tipc_net *tn = tipc_net(net);
smp_mb();
tipc_named_reinit(net); spin_lock_bh(&tn->node_list_lock);
tipc_sk_reinit(net); if (!tipc_own_addr(net)) {
tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr, tipc_set_node_addr(net, addr);
TIPC_CLUSTER_SCOPE, 0, addr); tipc_named_reinit(net);
tipc_sk_reinit(net);
tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr,
TIPC_CLUSTER_SCOPE, 0, addr);
}
spin_unlock_bh(&tn->node_list_lock);
} }
void tipc_net_stop(struct net *net) void tipc_net_stop(struct net *net)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册