From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0AE3374A05; Thu, 11 Jun 2026 20:01:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781208076; cv=none; b=Zvha9N3jadlP0s23523c2A1EA/TJiOzHJ+ZsifINt6QFwe86L68UJJ7kNdcnH7W4X0NZDE6SiGwUdMSzu36IaJXL5i4jc3AGSuqnJoYZC8KWWitPTmwz12SX4+F6ErugCZdNW2HTV8EiCcnWVSXPnOOcL2ApSC1z0NqHU2OdfSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781208076; c=relaxed/simple; bh=FIsmlgIjkpteAPJhVKKHAjd95/iwb4iZSOjkZwgqzRQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=haOlx8X9gvpMA+dchB2/A1f+qse5xf/V3l+Z1dVaiBoRoTzV0iAe6OokV399vBykG1l70SB1HYeT1SSvdgxNwKoF/FyCJpzu3oYVxgSu0E4kNVERJvpSCmpZ2eG6UvvNavsp+eO9wLffgl8PWb4brhPEZhDv5PY55TbDeXeG0As= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RNVBkOm5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RNVBkOm5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E46C41F00A3A; Thu, 11 Jun 2026 20:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781208075; bh=fc7tna7IOIRFEaG5wY6UE/IusmPFmDcTxG+DmFVpXeE=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=RNVBkOm5cO+3RieMaxQ1ErzW0RvBGi68NBdcxzwv/dyHo29M7zFu11AsIcwDvusCF m1jZvnHuz0seEgSpyMhpu1FCw3ZKCUm6eT6rZrvTOS7LSjc4o3RPaQm5iT57ZhMrkC 1YLb0cj75msku44C6iPv1HGjUBjSKkg/vvxt8pQMbtjMdJNLIF9l3vT1pqR93I/0eq esKNZWI5gNJuqDg1LERM7NeGhgNIki+lwgOZFtdGZQ9IbDh+WzCpheODncWG6eRg4s 3gh8k3k5KeJd7wf6tsH0Pgc+CpmMZG5H3iQe2T1ESNEUy2ddulngTAcEookIF6D5r8 PCbD8xEKROiqw== From: Jeff Layton Date: Thu, 11 Jun 2026 16:00:52 -0400 Subject: [PATCH v2 09/21] nfsd: fix version mismatch loops in nfsd_acl_init_request() Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260611-nfsd-testing-v2-9-5b90e276f2d9@kernel.org> References: <20260611-nfsd-testing-v2-0-5b90e276f2d9@kernel.org> In-Reply-To: <20260611-nfsd-testing-v2-0-5b90e276f2d9@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: Chris Mason , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1505; i=jlayton@kernel.org; h=from:subject:message-id; bh=FIsmlgIjkpteAPJhVKKHAjd95/iwb4iZSOjkZwgqzRQ=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqKxP+lmFR3OKsFmRYIKX5XgaTu3fj4Pjy9qv1y ix6R7CYt6KJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaisT/gAKCRAADmhBGVaC FV0gEAC5i+So2Unar7uF4D5Yb5QPP1Jrw7D6YEDZzMukmseasIifJTcKqYxyyfT4rFAoxDOxK20 YMUbDLioda1jEUECUProTnWf9Y3+HE4tEE+7TbavVwvCKL8Fhn+Ut1k7ar5icw/QezyJ4Wj9ijs KxzlOjWxV3HmX66I1Tr0A+TnP/GcbodtavO6Cq1qVZeILNXL9Xkx6einUc85FDG9X6E40Ht2O9t rDi/pQvjRD/o+HPee1Gwh+lfznh5nofF1AXEJcoaR2vHaLJ0aCFppN3wM+Qw5cthOuUQm6fVWwO ixg8yNuFzGuXqFSu58fEDokO9mq0H99T8VsNGLDdAZ53li2rpT+jFbBeYhjlMaRhnjbaEls2HMO QXuMpLl8EOVZ7jF7og4ZGJDfqTGhfj9qqTJ6e0kwKPvXPVpDBgX8QOmUPxLhFN/kzXhqo9k9dJI qa/9ZQzyq/Y4HNKkRns6pRUFDPsriuSi58cREg20wzPS1ZIkjgRNcMrVzy92UUDzrLghfm/UYB4 jU7sH2j6hnB8AVcS4UFAXf1aWihedCIYYitvrRvcHRsIf6o99Swk69IK2lyFT60B9r+zsVZv8Lr wfOWyZGSDNVbBd45kxnN+u+yy5GlSH3YECF54i9hr3Xe5AKKMYKLXcE3iFGaPDMlppZIT3RAKiS 2O7dFPE7pIe9+fA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The loops that compute the supported version range for PROG_MISMATCH test nfsd_support_acl_version(rqstp->rq_vers) instead of nfsd_support_acl_version(i), so every iteration fails and the function returns rpc_prog_unavail instead of rpc_prog_mismatch. Replace rqstp->rq_vers with the loop variable i, matching the pattern used by the sibling nfsd_init_request() function. Fixes: e333f3bbefe3 ("nfsd: Allow containers to set supported nfs versions") Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Jeff Layton --- fs/nfsd/nfssvc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 0d3838dd59c1..b8e8d80e984c 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -821,7 +821,7 @@ nfsd_acl_init_request(struct svc_rqst *rqstp, ret->mismatch.lovers = NFSD_ACL_NRVERS; for (i = NFSD_ACL_MINVERS; i < NFSD_ACL_NRVERS; i++) { - if (nfsd_support_acl_version(rqstp->rq_vers) && + if (nfsd_support_acl_version(i) && nfsd_vers(nn, i, NFSD_TEST)) { ret->mismatch.lovers = i; break; @@ -831,7 +831,7 @@ nfsd_acl_init_request(struct svc_rqst *rqstp, return rpc_prog_unavail; ret->mismatch.hivers = NFSD_ACL_MINVERS; for (i = NFSD_ACL_NRVERS - 1; i >= NFSD_ACL_MINVERS; i--) { - if (nfsd_support_acl_version(rqstp->rq_vers) && + if (nfsd_support_acl_version(i) && nfsd_vers(nn, i, NFSD_TEST)) { ret->mismatch.hivers = i; break; -- 2.54.0