From patchwork Fri Jul 6 18:10:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Maloy X-Patchwork-Id: 940663 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ericsson.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.com header.i=@ericsson.com header.b="YyHoGIgq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41MjSZ44kPz9s1B for ; Sat, 7 Jul 2018 04:10:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934287AbeGFSKT (ORCPT ); Fri, 6 Jul 2018 14:10:19 -0400 Received: from sesbmg23.ericsson.net ([193.180.251.37]:53421 "EHLO sesbmg23.ericsson.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934016AbeGFSKR (ORCPT ); Fri, 6 Jul 2018 14:10:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/simple; q=dns/txt; i=@ericsson.com; t=1530900615; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xdO6lwuRm+XeMptfpzDhdXmVOR2x5UbUGHeKfvOGL4M=; b=YyHoGIgq0mqpx/k8CILLrUTDKfnFLrtaeJg402xsgyQxbdVZbc2FWX5o9ZwbB3yZ h8e1WVLlYmLJeBwm4Uew7JYOGZPM6g8NBd2bBm1MmvBZaqiIlShB7/jss7XbHsZM YaHqzqeuRn28GriY+m/UNESilp3NIraWof5SUqEjFS4=; X-AuditID: c1b4fb25-e23ff70000006310-92-5b3fb0873200 Received: from ESESBMB501.ericsson.se (Unknown_Domain [153.88.183.114]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 0E.DF.25360.780BF3B5; Fri, 6 Jul 2018 20:10:15 +0200 (CEST) Received: from ESESSMB503.ericsson.se (153.88.183.164) by ESESBMB501.ericsson.se (153.88.183.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 6 Jul 2018 20:10:15 +0200 Received: from ESESSHC011.ericsson.se (153.88.183.51) by ESESSMB503.ericsson.se (153.88.183.164) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256) id 15.1.1466.3 via Frontend Transport; Fri, 6 Jul 2018 20:10:15 +0200 Received: from daly.lab.linux.ericsson.se (10.35.28.123) by ESESSHC011.ericsson.se (153.88.183.51) with Microsoft SMTP Server (TLS) id 14.3.382.0; Fri, 6 Jul 2018 20:10:14 +0200 From: Jon Maloy To: , CC: , , , , , , Subject: [net 2/4] tipc: correct discovery message handling during address trial period Date: Fri, 6 Jul 2018 20:10:04 +0200 Message-ID: <1530900606-24429-3-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1530900606-24429-1-git-send-email-jon.maloy@ericsson.com> References: <1530900606-24429-1-git-send-email-jon.maloy@ericsson.com> MIME-Version: 1.0 X-Originating-IP: [10.35.28.123] X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRmVeSWpSXmKPExsUyM2J7kW77Bvtog6U3LSxuNPQwW8w538Ji sWL3JFaLt69msVscWyBmseV8lsWV9rPsFo+vX2d24PDYsvImk8e7K2weuxd8ZvL4vEnOY/2W rUwBrFFcNimpOZllqUX6dglcGfMeNjMVbOepeHrpMVsD40SuLkYODgkBE4l1X4K7GLk4hASO Mko0nJzLDuF8ZZSYu/0gK4TTwSTxZtsXZghnK6PEp1mngMo4OdgENCReTutgBLFFBIwlXq3s ZAIpYhZ4zCjx5f4qNpCEsEC4xP/jV8BsFgEViXvnd4M18wq4Say5+gusWUJATuL88Z/MIDan gLvE+glzmUBsIaCalvftUPWCEidnPmEBsZkFJCQOvnjBDFGjLDH3wzQmiDkKEh9mLWObwCg0 C0nLLCQtCxiZVjGKFqcWJ+WmGxnrpRZlJhcX5+fp5aWWbGIExsHBLb9VdzBefuN4iFGAg1GJ h7d7rX20EGtiWXFl7iFGCQ5mJRFerXqgEG9KYmVValF+fFFpTmrxIUZpDhYlcd6H5pujhATS E0tSs1NTC1KLYLJMHJxSDYztnodPM3HP+V9VLK2v+V9g0XUR3/93V872dm518zM5+DspdY9M wbWw5irpv9dKVy69pmhdGFL71fzi0ul7TPsPnLCTmbI4ZFWSWxTDgqjgk2W8i7Z92Ji+xXN5 cc5/xx8pRsFcH/0tCoNeyNS0KdQfvr6rJX3F0uAd7Qye4mZXpELO+GRV31FiKc5INNRiLipO BAAHRzgDfwIAAA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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)