33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 2fa924062a9494772cd997cb8b1ec572cfe6490f Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neil@brown.name>
|
|
Date: Fri, 28 Mar 2025 11:05:59 +1100
|
|
Subject: nfsd: nfsd4_spo_must_allow() must check this is a v4 compound request
|
|
|
|
If the request being processed is not a v4 compound request, then
|
|
examining the cstate can have undefined results.
|
|
|
|
This patch adds a check that the rpc procedure being executed
|
|
(rq_procinfo) is the NFSPROC4_COMPOUND procedure.
|
|
|
|
Reported-by: Olga Kornievskaia <okorniev@redhat.com>
|
|
Cc: stable@vger.kernel.org
|
|
Reviewed-by: Jeff Layton <jlayton@kernel.org>
|
|
Signed-off-by: NeilBrown <neil@brown.name>
|
|
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
---
|
|
fs/nfsd/nfs4proc.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/fs/nfsd/nfs4proc.c
|
|
+++ b/fs/nfsd/nfs4proc.c
|
|
@@ -3766,7 +3766,8 @@ bool nfsd4_spo_must_allow(struct svc_rqs
|
|
struct nfs4_op_map *allow = &cstate->clp->cl_spo_must_allow;
|
|
u32 opiter;
|
|
|
|
- if (!cstate->minorversion)
|
|
+ if (rqstp->rq_procinfo != &nfsd_version4.vs_proc[NFSPROC4_COMPOUND] ||
|
|
+ cstate->minorversion == 0)
|
|
return false;
|
|
|
|
if (cstate->spo_must_allowed)
|