Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tipc: correct discovery message handling during address trial period

Browse Source 
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: 25b0b9c4e8 ("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>
This commit is contained in:
Jon Maloy 2018-07-06 20:10:04 +02:00 committed by David S. Miller
parent 2a57f18242
commit e415577f57
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/tipc/discover.c
View File

@ -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 /* 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, static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
struct tipc_media_addr *maddr, 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); msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
} }
/* Accept regular link requests/responses only after trial period */
if (mtyp != DSC_TRIAL_MSG) if (mtyp != DSC_TRIAL_MSG)
return false; return trial;
sugg_addr = tipc_node_try_addr(net, peer_id, src); sugg_addr = tipc_node_try_addr(net, peer_id, src);
if (sugg_addr) if (sugg_addr)