From: Jeff Layton <jlayton@kernel.org>
To: chuck.lever@oracle.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH] nfsd: don't allow OPDESC to walk off the end of nfsd4_ops
Date: Thu, 30 Mar 2023 14:57:29 -0400 [thread overview]
Message-ID: <20230330185729.22895-1-jlayton@kernel.org> (raw)
Ensure that OPDESC() doesn't return a pointer that doesn't lie within
the array. In particular, this is a problem when this funtion is passed
OP_ILLEGAL, but let's return NULL for any invalid value.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/nfsd/nfs4proc.c | 2 ++
1 file changed, 2 insertions(+)
This is the patch that I think we want ahead of this one:
nfsd: call op_release, even when op_func returns an error
If you end up with OP_ILLEGAL, then op->opdesc ends up pointing
somewhere far, far away, and the new op_release changes can trip over
that. We could add a Fixes tag for this, I suppose:
22b03214962e nfsd4: introduce OPDESC helper
...but that commit is from 2011, so it's probably not worth it.
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 5ae670807449..5e7b4ca7a266 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -2494,6 +2494,8 @@ static __be32 nfs41_check_op_ordering(struct nfsd4_compoundargs *args)
const struct nfsd4_operation *OPDESC(struct nfsd4_op *op)
{
+ if (op->opnum < FIRST_NFS4_OP || op->opnum > LAST_NFS42_OP)
+ return NULL;
return &nfsd4_ops[op->opnum];
}
--
2.39.2
next reply other threads:[~2023-03-30 18:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 18:57 Jeff Layton [this message]
2023-03-30 19:32 ` [PATCH] nfsd: don't allow OPDESC to walk off the end of nfsd4_ops Chuck Lever III
2023-03-30 21:58 ` Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230330185729.22895-1-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox