git: f9337e56a2e3 - main - nfsd: Make nfsrv_getstate() validate the stateid type
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 17:01:40 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=f9337e56a2e3ba47b91272f1f3a8de6af6d27d5b
commit f9337e56a2e3ba47b91272f1f3a8de6af6d27d5b
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-11-12 17:19:03 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-17 16:57:00 +0000
nfsd: Make nfsrv_getstate() validate the stateid type
Otherwise nfsrv_delegupdate() can be tricked by a client into freeing a
state when it shouldn't, resulting in a use-after-free.
Approved by: so
Security: FreeBSD-SA-26:79.nfs
Security: CVE-2026-101317
Reported by: H. P. Cook <barry@unseen.sh>
---
sys/fs/nfsserver/nfs_nfsdstate.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 5b36dc9c9721..de5e5da86202 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -1745,7 +1745,7 @@ nfsrv_freenfslockfile(struct nfslockfile *lfp)
* This function looks up an nfsstate structure via stateid.
*/
static int
-nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, __unused u_int32_t flags,
+nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, u_int32_t flags,
struct nfsstate **stpp)
{
struct nfsstate *stp;
@@ -1763,7 +1763,8 @@ nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, __unused u_int32
/*
* If no state id in list, return NFSERR_BADSTATEID.
*/
- if (stp == LIST_END(hp)) {
+ if (stp == LIST_END(hp) || (flags == NFSLCK_DELEGRETURN &&
+ (stp->ls_flags & (NFSLCK_DELEGREAD | NFSLCK_DELEGWRITE)) == 0)) {
error = NFSERR_BADSTATEID;
goto out;
}
@@ -1950,8 +1951,7 @@ tryagain:
/*
* Look up the stateid
*/
- error = nfsrv_getstate(clp, &new_stp->ls_stateid,
- new_stp->ls_flags, &stp);
+ error = nfsrv_getstate(clp, &new_stp->ls_stateid, 0, &stp);
/*
* do some sanity checks for an unconfirmed open or a
* stateid that refers to the wrong file, for an open stateid
@@ -3484,8 +3484,7 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
(nfsquad_t)((u_quad_t)0), 0, nd, p);
if (!error)
- error = nfsrv_getstate(clp, &new_stp->ls_stateid,
- new_stp->ls_flags, &stp);
+ error = nfsrv_getstate(clp, &new_stp->ls_stateid, 0, &stp);
/*
* Sanity check the open.