[net,2/4] tipc: correct discovery message handling during address trial period

Message ID 1530900606-24429-3-git-send-email-jon.maloy@ericsson.com
State Accepted
Delegated to: David Miller
Headers show
  • tipc: fixes in duplicate address discovery function
Related show

Commit Message

Jon Maloy July 6, 2018, 6:10 p.m.
With the duplicate address discovery protocol for tipc nodes addresses
we introduced a one second trial period before a node is allocated a
hash number to use as address.

Unfortunately, we miss to handle the case when a regular LINK REQUEST/
RESPONSE arrives from a cluster node during the trial period. Such
messages are not ignored as they should be, leading to links setup
attempts while the node still has no address.

Fixes: 25b0b9c4e835 ("tipc: handle collisions of 32-bit node address hash values")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
 net/tipc/discover.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 9f666e0..dcadc10 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -133,6 +133,8 @@  static void disc_dupl_alert(struct tipc_bearer *b, u32 node_addr,
 /* tipc_disc_addr_trial(): - handle an address uniqueness trial from peer
+ * Returns true if message should be dropped by caller, i.e., if it is a
+ * trial message or we are inside trial period. Otherwise false.
 static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
 				     struct tipc_media_addr *maddr,
@@ -168,8 +170,9 @@  static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
 		msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
+	/* Accept regular link requests/responses only after trial period */
 	if (mtyp != DSC_TRIAL_MSG)
-		return false;
+		return trial;
 	sugg_addr = tipc_node_try_addr(net, peer_id, src);
 	if (sugg_addr)