Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
From:   "NeilBrown" <neilb@suse.de>
To:     "Ian Kent" <raven@themaw.net>
Cc:     autofs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [ANNOUNCE] autofs 5.1.8 release
In-reply-to: <b54fb31652a4ba76b39db66b8ae795ee3af6f025.camel@themaw.net>
References: <b54fb31652a4ba76b39db66b8ae795ee3af6f025.camel@themaw.net>
Date:   Thu, 10 Feb 2022 08:59:48 +1100
Message-id: <164444398868.27779.4643380819577932837@noble.neil.brown.name>
Precedence: bulk

On Tue, 19 Oct 2021, Ian Kent wrote:
> Hi all,
>=20
> It's time for a release, autofs-5.1.8.
>=20
...
> - also require TCP_REQUESTED when setting NFS port.

Unfortunately that last patch is buggy.  TCP_REQUESTED is masked out in
the caller.

Maybe the following is best.

NeilBrown

From: NeilBrown <neilb@suse.de>
Subject: [PATCH] Test TCP request correctly in nfs_get_info()

The TCP_REQUESTED flag is masked out by the caller, so it never gets to
nfs_get_info().
We can test if TCP was requested by examining the 'proto' parameter.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/modules/replicated.c b/modules/replicated.c
index 09075dd0c1b4..3ac7ee432e73 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct =
host *host,
=20
 	rpc_info->proto =3D proto;
 	if (port < 0) {
-		if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED))
+		if ((version & NFS4_REQUESTED) && (proto =3D=3D IPPROTO_TCP))
 			rpc_info->port =3D NFS_PORT;
 		else
 			port =3D 0;