From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795024361; b=wUqCVB/UnzCk5E7Q6mUp89EZBczy8bf31K1lOxq9cv3zGGTt374+LVY068FWPLunyVGd GYFYzcDUTBzDt5mgNSSrnuHcW01YktlsN6rGLXoapuckRaIezHOdhcX3pAEADFVMNNwIl qpqHqmop+nRjpvSH9kCrsrWTnsku5AfYEpvlmGtJWgbxOK/ywVVd5yIcBWrH+XPpd+r3e k+6jyot/ROAdaC9JGQGvOMJO4FkQ5dNUUtu+FXiMbWQUFrLU/W/5gc8uhCurj/bD4gnDH jqwoAqgDyUvKSL4Rj2XaYFjm2YxIIjFDwJt1fas/yc8hXFZHpBJ3/niCRT392kiMmdA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024361; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Vy4l9vWKZNmNfWY/hQYwOMIm1Clyw4dv6sbiRh7ewu4=; b=MqvM8DGBZ8Kj92c36ZRl3BJ1MBAZv4itJt56ScvX6ZGB4mD0gqaX2IC1ekJK/PpugwG2 gvCHSlN43iCbq7fGmHOpT2jrefHoIZyUvTlWIwEt420fPHcDmLiNjzAT+CUF/qI8rfnT9 JsFqrqN1PfxPipLrXdpyofKRIFEsHj6KtHN8uB9frMpO3GYw55Tj4REVe02ArWPEZNLZn 7nO3W/4VsTWWS3BJlSHzU3HyHiNDKH9y+s2zplDVuUm6lhqNkEnASR8EeBvK/x6wuSww7 U/D/4h9JhqlWExIgkwMl/B331WL80Y3g2WS6Np275lRfPYdNSWR5JoGLsVgOqmxRWvA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eTIoTSU+; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B86960A260F; Wed, 18 Nov 2026 17:52:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=eTIoTSU+ Received: by smtp.kernel.org (Postfix) with ESMTPSA id B341D1F000C4; Wed, 18 Nov 2026 17:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024361; bh=Vy4l9vWKZNmNfWY/hQYwOMIm1Clyw4dv6sbiRh7ewu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eTIoTSU+FF/PkGLB8AyvFxZCySMiyMOBwmogueDPt/kbdaSoNIb2MuNRJ5lkjLjNw l1iY6waNMZp7wb/k3bbzh5Pkr8EjfJmDt5AtOqJhg/UCpCwSFgN2sfxbXhA2t9AeMX 2bDRhXejnKoTsnWsd3fR7s2DO+1UJfK3GF0M4bcw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chuck Lever , Prabhakar Pujeri , Trond Myklebust , Sasha Levin Subject: [PATCH 6.18 0691/2151] NFS: use TCP for MOUNT when xprtsec= selects TLS Date: Wed, 18 Nov 2026 15:40:26 +0100 Message-ID: <20261118150146.961240939@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever [ Upstream commit 72233aabc78cd0415c850641bc2a6e4fea23173f ] An NFSv2 or NFSv3 text mount that specifies xprtsec= but no mountproto= crashes in nfs_init_timeout_values(): RIP: 0010:nfs_init_timeout_values+0x10a/0x110 [nfs] Call Trace: nfs_mount+0x1c3/0x330 [nfs] nfs_try_get_tree+0x1e5/0x460 [nfs] nfs_get_tree+0x64d/0x6d0 [nfs] vfs_get_tree+0x2b/0xe0 vfs_cmd_create+0x5f/0xd0 vfs_fsconfig_locked+0x50/0x130 __se_sys_fsconfig+0x2f9/0x3a0 nfs_validate_transport_protocol() sets nfs_server.protocol to XPRT_TRANSPORT_TCP_TLS when xprtsec= is present, but the switch in nfs_set_mount_transport_protocol() has no case for that value. mount_server.protocol stays zero, and nfs_init_timeout_values() calls BUG() on a transport it does not recognize. mount.nfs always appends mountproto= after probing the server's rpcbind, so only a caller that bypasses it, such as "mount -i" or a program that drives fsconfig() directly, reaches the crash. Select TCP for MOUNT when the NFS transport is XPRT_TRANSPORT_TCP_TLS. nfs_mount() requests no transport security, so MOUNT already runs over plain TCP whenever mount.nfs supplies mountproto=tcp. Fixes: c8407f2e560c ("NFS: Add an "xprtsec=" NFS mount option") Signed-off-by: Chuck Lever Reviewed-by: Prabhakar Pujeri Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/fs_context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c index 128ebd48b4f4b..912a45d033db8 100644 --- a/fs/nfs/fs_context.c +++ b/fs/nfs/fs_context.c @@ -402,6 +402,7 @@ static void nfs_set_mount_transport_protocol(struct nfs_fs_context *ctx) ctx->mount_server.protocol = XPRT_TRANSPORT_UDP; break; case XPRT_TRANSPORT_TCP: + case XPRT_TRANSPORT_TCP_TLS: case XPRT_TRANSPORT_RDMA: ctx->mount_server.protocol = XPRT_TRANSPORT_TCP; } -- 2.53.0