From nobody Tue Nov 17 17:02:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTWJ663vRz71Qjq for ; Tue, 17 Nov 2026 17:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWJ646rJz4BGR for ; Tue, 17 Nov 2026 17:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayv6QSKqA/z9uMsBiHcSlKnSREzcMOmy5h7gVQCENOg=; b=fH5JwbI48RBbwVDFXCIQw9siEPf21u+lLWos21ICdHI7ssMmrsyg65Rn7ygfibHAlXlvJq yx2CKiLoBrkc1wbdpWQ9ZtfBvKN72OZbkDyNZOGvZUxBbNlu0/oPnf3aNs4hl+WrDG9Df6 T6ex9evHbDgXf7fdpsKvZBiUpW5LCzztwRrXgLpjSaE4QPtskU4snC5wDpMr/cyOvs/CAq Qzepuv6WN5c0kfaBFuNT6iPc+ZXoMZhcEioT1162KojhxsDUNpNmUvYl954LrgYcoqrQyW 2Y9nvRBw6G3tinph//4fCY0mRc0B43D8Ha8cJ8WYht3490pkABvIe4y90j96BA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934966; b=E0iKjzT/moHpbEJl8jQ8IBhdYLfuodJfB4YeRGl0bpM0lQfbFjPLVyTUNbrWEa/ko7+2t2 Z/pu/S85TzBFaqHrPRdz1MJhfktxM2bVP+kfSM503xE8hEY02iP9bvJS6/m4g8Wx1eIw7u rQ1UpcF+qdpX+FIk5mjG/lc+TgGFANNIY3E0eFJ0HMhbVrcd20m9MbrVNeAmUJrkb33dGC sWzGgBiLor/S+2hsVAs4o3ZNDQYgO+SdYoN6N2iaalsrjf/OJXZj7FtQWnSfimC8OMABvv bWeJaOFjvdIChdnuoDoCr3kXhfetgGKKlaXQ5Lkvm/3kT0NC3gt3AZW5RM7cpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ayv6QSKqA/z9uMsBiHcSlKnSREzcMOmy5h7gVQCENOg=; b=dYsBG/NCm6qJRM8OXLqFvUimat7lgbm7mnqkPYWryNfh145eugh6ATB7KmEpi8iOvE4HAQ YaSjxJkvtUJ6Yv3uHUbtDMzU/0o9kC7NAY++20ktRa0Z+xRxVgZYV+jpgpjtSykR/sfucx URnPdcn57nG777y+RjeYp5J6G6efv8ZiC+KVtZ3WdTnXFxPNRychBjkZkaG3DbThrKN9Pn gzs9V8oR6OA+aigxGh4x09VhUNV7IPFD5vJd6uJvZGwRwwGwd6qG+x1jLkkrBpxCAbFtPj Y5MmiplUPhPjITwbwBlexdgJW9fIsTxC2vKBvDoJkch7qPANcfe6OwBBqM7nGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWJ63SBlzrM2 for ; Tue, 17 Nov 2026 17:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e033 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rick Macklem From: Mark Johnston Subject: git: b04070ee6f3f - stable/14 - nfsd: Make nfsrv_getstate() validate the stateid type List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b04070ee6f3ff6a9f42ac648c6223a35fe6d89da Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:46 +0000 Message-Id: <6afc88b6.1e033.64bf9429@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b04070ee6f3ff6a9f42ac648c6223a35fe6d89da commit b04070ee6f3ff6a9f42ac648c6223a35fe6d89da Author: Rick Macklem AuthorDate: 2026-11-12 17:19:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:10 +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 --- 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 e7ca9598955e..36dacb1c2f84 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -1738,7 +1738,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; @@ -1756,7 +1756,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; } @@ -1943,8 +1944,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 @@ -3477,8 +3477,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.