diff options
| author | Jon Maloy <jon.maloy@ericsson.com> | 2018-07-18 19:50:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-20 12:36:13 -0700 |
| commit | 40999f11ce677ce3c5d0e8f5f76c40192a26b479 (patch) | |
| tree | 5b5dac9106b60eb5d67e5f204a55ecaeb6db9b43 | |
| parent | f91a0effcaa6a2eec647cdc53d0d16bff5144c10 (diff) | |
| download | linux-40999f11ce677ce3c5d0e8f5f76c40192a26b479.tar.bz2 | |
tipc: make link capability update thread safe
The commit referred to below introduced an update of the link
capabilities field that is not safe. Given the recently added
feature to remove idle node and link items after 5 minutes, there
is a small risk that the update will happen at the very moment the
targeted link is being removed. To avoid this we have to perform
the update inside the node item's write lock protection.
Fixes: 9012de508956 ("tipc: add sequence number check for link STATE messages")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/node.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 52fd80b0e728..3819ab14e073 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -370,13 +370,17 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr, spin_lock_bh(&tn->node_list_lock); n = tipc_node_find(net, addr); if (n) { + if (n->capabilities == capabilities) + goto exit; /* Same node may come back with new capabilities */ + write_lock_bh(&n->lock); n->capabilities = capabilities; for (bearer_id = 0; bearer_id < MAX_BEARERS; bearer_id++) { l = n->links[bearer_id].link; if (l) tipc_link_update_caps(l, capabilities); } + write_unlock_bh(&n->lock); goto exit; } n = kzalloc(sizeof(*n), GFP_ATOMIC); |