diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2018-07-06 20:10:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-07 12:49:02 +0200 |
| commit | 9faa89d4ed9d7d326f4763d262842270450f9b1f (patch) | |
| tree | 7d2f742a0a79418fa0b8388e0b4d19847d58298a /net/tipc/net.c | |
| parent | tipc: fix correct setting of message type in second discoverer (diff) | |
| download | linux-9faa89d4ed9d7d326f4763d262842270450f9b1f.tar.xz linux-9faa89d4ed9d7d326f4763d262842270450f9b1f.zip | |
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: 25b0b9c4e835 ("tipc: handle collisions of 32-bit node address hash values")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 4fbaa0464405..a7f6964c3a4b 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -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) { - tipc_set_node_addr(net, addr); - smp_mb(); - tipc_named_reinit(net); - tipc_sk_reinit(net); - tipc_nametbl_publish(net, TIPC_CFG_SRV, addr, addr, - TIPC_CLUSTER_SCOPE, 0, addr); + struct tipc_net *tn = tipc_net(net); + + spin_lock_bh(&tn->node_list_lock); + if (!tipc_own_addr(net)) { + tipc_set_node_addr(net, 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) |