Skip to contentSkip to conversation

tipc: fix wrong notification node addresses

PATCH Applied [email protected] 3 participants 5 messages Feb 16, 2022 – Feb 17, 2022

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH v2 1/1 tipc: fix wrong notification node addresses

From: Jon Maloy <[email protected]>

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.

We fix this now.

Fixes 032062f363b4 ("tipc: fix wrong publisher node address in link publications")

---
v2: Copied n->addr to stack variable before leaving lock context, and
using this in the notifications.

---
 net/tipc/node.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
net/tipc/node.c +6 -5
index fd95df338da7..6ef95ce565bd 100644
@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 	u32 flags = n->action_flags;
 	struct list_head *publ_list;
 	struct tipc_uaddr ua;
-	u32 bearer_id;
+	u32 bearer_id, node;
 
 	if (likely(!flags)) {
 		write_unlock_bh(&n->lock);
@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 		   TIPC_LINK_STATE, n->addr, n->addr);
 	sk.ref = n->link_id;
 	sk.node = tipc_own_addr(net);
+	node = n->addr;
 	bearer_id = n->link_id & 0xffff;
 	publ_list = &n->publ_list;
 
@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 	write_unlock_bh(&n->lock);
 
 	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)
-		tipc_named_node_up(net, sk.node, n->capabilities);
+		tipc_named_node_up(net, node, n->capabilities);
 
 	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);
 	}
 	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);
 	}
 }
Signature · 1 line
2.31.1
#1 lore raw
Quoted 11 lines · On Tue, Feb 15, 2022 at 09:00:09PM -0500, [email protected] wrote:

From: Jon Maloy <[email protected]>

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.

We fix this now.

Fixes 032062f363b4 ("tipc: fix wrong publisher node address in link publications")

Please don't put blank lines between Fixes and SOB lines.

Thanks

Quoted 55 lines

---
v2: Copied n->addr to stack variable before leaving lock context, and
using this in the notifications.

---
 net/tipc/node.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
net/tipc/node.c +6 -5
index fd95df338da7..6ef95ce565bd 100644
@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 	u32 flags = n->action_flags;
 	struct list_head *publ_list;
 	struct tipc_uaddr ua;
-	u32 bearer_id;
+	u32 bearer_id, node;
 
 	if (likely(!flags)) {
 		write_unlock_bh(&n->lock);
@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 		   TIPC_LINK_STATE, n->addr, n->addr);
 	sk.ref = n->link_id;
 	sk.node = tipc_own_addr(net);
+	node = n->addr;
 	bearer_id = n->link_id & 0xffff;
 	publ_list = &n->publ_list;
 
@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n)
 	write_unlock_bh(&n->lock);
 
 	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)
-		tipc_named_node_up(net, sk.node, n->capabilities);
+		tipc_named_node_up(net, node, n->capabilities);
 
 	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);
 	}
 	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);
 	}
 }
Signature · 1 line
2.31.1
author maintainer
#2 lore raw
Quoted 8 lines · Leon Romanovsky
Quoted 7 lines · On Tue, Feb 15, 2022 at 09:00:09PM -0500, [email protected] wrote:

From: Jon Maloy <[email protected]>

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.

Quoted 7 lines
Quoted 4 lines

We fix this now.

Fixes 032062f363b4 ("tipc: fix wrong publisher node address in link publications")

Please don't put blank lines between Fixes and SOB lines.

Thanks

Seems like somebody should update the checkpatch.pl script.

///jon

Quoted 56 lines
Quoted 56 lines

---
v2: Copied n->addr to stack variable before leaving lock context, and
using this in the notifications.

---
  net/tipc/node.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
net/tipc/node.c +6 -5
index fd95df338da7..6ef95ce565bd 100644
@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  	u32 flags = n->action_flags;
  	struct list_head *publ_list;
  	struct tipc_uaddr ua;
-	u32 bearer_id;
+	u32 bearer_id, node;
 
  	if (likely(!flags)) {
  		write_unlock_bh(&n->lock);
@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  		   TIPC_LINK_STATE, n->addr, n->addr);
  	sk.ref = n->link_id;
  	sk.node = tipc_own_addr(net);
+	node = n->addr;
  	bearer_id = n->link_id & 0xffff;
  	publ_list = &n->publ_list;
 
@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  	write_unlock_bh(&n->lock);
 
  	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)
-		tipc_named_node_up(net, sk.node, n->capabilities);
+		tipc_named_node_up(net, node, n->capabilities);
 
  	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);
  	}
  	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);
  	}
  }
Signature · 1 line
2.31.1
#3 lore raw
Quoted 11 lines · Jon Maloy
Quoted 8 lines · Leon Romanovsky
Quoted 7 lines · On Tue, Feb 15, 2022 at 09:00:09PM -0500, [email protected] wrote:

From: Jon Maloy <[email protected]>

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.

Quoted 8 lines
Quoted 7 lines
Quoted 4 lines

We fix this now.

Fixes 032062f363b4 ("tipc: fix wrong publisher node address in link publications")

Please don't put blank lines between Fixes and SOB lines.

Thanks

Seems like somebody should update the checkpatch.pl script.

Patches are welcomed :)

Quoted 55 lines

///jon

Quoted 51 lines
Quoted 51 lines

---
v2: Copied n->addr to stack variable before leaving lock context, and
using this in the notifications.

---
  net/tipc/node.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
net/tipc/node.c +6 -5
index fd95df338da7..6ef95ce565bd 100644
@@ -403,7 +403,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  	u32 flags = n->action_flags;
  	struct list_head *publ_list;
  	struct tipc_uaddr ua;
-	u32 bearer_id;
+	u32 bearer_id, node;
  	if (likely(!flags)) {
  		write_unlock_bh(&n->lock);
@@ -414,6 +414,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  		   TIPC_LINK_STATE, n->addr, n->addr);
  	sk.ref = n->link_id;
  	sk.node = tipc_own_addr(net);
+	node = n->addr;
  	bearer_id = n->link_id & 0xffff;
  	publ_list = &n->publ_list;
@@ -423,17 +424,17 @@ static void tipc_node_write_unlock(struct tipc_node *n)
  	write_unlock_bh(&n->lock);
  	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)
-		tipc_named_node_up(net, sk.node, n->capabilities);
+		tipc_named_node_up(net, node, n->capabilities);
  	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);
  	}
  	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);
  	}
  }
Signature · 1 line
2.31.1
#4 lore raw
In reply to [email protected]
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Tue, 15 Feb 2022 21:00:09 -0500 you wrote:

From: Jon Maloy <[email protected]>

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.

[...]

Here is the summary with links:
- [v2,net] tipc: fix wrong notification node addresses

    https://git.kernel.org/netdev/net/c/c08e58438d4a

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html