Commit c08e5843 authored by Jon Maloy's avatar Jon Maloy Committed by Jakub Kicinski

tipc: fix wrong notification node addresses

The previous bug fix had an unfortunate side effect that broke
distribution of binding table entries between nodes. The updated
tipc_sock_addr struct is also used further down in the same
function, and there the old value is still the correct one.

Fixes: 032062f3 ("tipc: fix wrong publisher node address in link publications")
Signed-off-by: default avatarJon Maloy <jmaloy@redhat.com>
Link: https://lore.kernel.org/r/20220216020009.3404578-1-jmaloy@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8c6ae461
...@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n) ...@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
u32 flags = n->action_flags; u32 flags = n->action_flags;
struct list_head *publ_list; struct list_head *publ_list;
struct tipc_uaddr ua; struct tipc_uaddr ua;
u32 bearer_id; u32 bearer_id, node;
if (likely(!flags)) { if (likely(!flags)) {
write_unlock_bh(&n->lock); write_unlock_bh(&n->lock);
...@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n) ...@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
TIPC_LINK_STATE, n->addr, n->addr); TIPC_LINK_STATE, n->addr, n->addr);
sk.ref = n->link_id; sk.ref = n->link_id;
sk.node = tipc_own_addr(net); sk.node = tipc_own_addr(net);
node = n->addr;
bearer_id = n->link_id & 0xffff; bearer_id = n->link_id & 0xffff;
publ_list = &n->publ_list; publ_list = &n->publ_list;
...@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n) ...@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n)
write_unlock_bh(&n->lock); write_unlock_bh(&n->lock);
if (flags & TIPC_NOTIFY_NODE_DOWN) if (flags & TIPC_NOTIFY_NODE_DOWN)
tipc_publ_notify(net, publ_list, sk.node, n->capabilities); tipc_publ_notify(net, publ_list, node, n->capabilities);
if (flags & TIPC_NOTIFY_NODE_UP) if (flags & TIPC_NOTIFY_NODE_UP)
tipc_named_node_up(net, sk.node, n->capabilities); tipc_named_node_up(net, node, n->capabilities);
if (flags & TIPC_NOTIFY_LINK_UP) { if (flags & TIPC_NOTIFY_LINK_UP) {
tipc_mon_peer_up(net, sk.node, bearer_id); tipc_mon_peer_up(net, node, bearer_id);
tipc_nametbl_publish(net, &ua, &sk, sk.ref); tipc_nametbl_publish(net, &ua, &sk, sk.ref);
} }
if (flags & TIPC_NOTIFY_LINK_DOWN) { if (flags & TIPC_NOTIFY_LINK_DOWN) {
tipc_mon_peer_down(net, sk.node, bearer_id); tipc_mon_peer_down(net, node, bearer_id);
tipc_nametbl_withdraw(net, &ua, &sk, sk.ref); tipc_nametbl_withdraw(net, &ua, &sk, sk.ref);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment