Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
To:     jmaloy@redhat.com, ying.xue@windriver.com, davem@davemloft.net
Cc:     netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net,
        linux-kernel@vger.kernel.org,
        Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Subject: [PATCH] tipc: Fix recognition of trial period
Date:   Mon, 10 Oct 2022 15:46:13 +1300
Message-Id: <20221010024613.2951-1-mark.tomlinson@alliedtelesis.co.nz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The trial period exists until jiffies is after addr_trial_end. But as
jiffies will eventually overflow, just using time_after will eventually
give incorrect results. As the node address is set once the trial period
ends, this can be used to know that we are not in the trial period.

Fixes: e415577f57f4 ("tipc: correct discovery message handling during add=
ress trial period")
Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
---
 net/tipc/discover.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index da69e1abf68f..e8630707901e 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -148,8 +148,8 @@ static bool tipc_disc_addr_trial_msg(struct tipc_disc=
overer *d,
 {
 	struct net *net =3D d->net;
 	struct tipc_net *tn =3D tipc_net(net);
-	bool trial =3D time_before(jiffies, tn->addr_trial_end);
 	u32 self =3D tipc_own_addr(net);
+	bool trial =3D time_before(jiffies, tn->addr_trial_end) && !self;
=20
 	if (mtyp =3D=3D DSC_TRIAL_FAIL_MSG) {
 		if (!trial)
--=20
2.38.0