From nobody Tue Nov 17 17:09:34 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 4jTWRy5J2nz71Sd2 for ; Tue, 17 Nov 2026 17:09:34 +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 4jTWRy26wHz4Pys for ; Tue, 17 Nov 2026 17:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935374; 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=kTfN/nI52JHuN4AdQJ+R+8e3IU+RZLj/iFVOr9UCADs=; b=MhxIx9t1evI21dbh14sYbJWYh/3GouJyyyG+0eA8ITkB2NryRjaOk43ClPOXyJmVL39PKl 87TiGMNRCaM0k4CVcou9aef2JXOKF5xJZ7NoV3vCx2N0kYUbvpl0Q9SsSgsiCKDd0frwvu WMJ56eAOTTjJGrVSspoICdezctlY+EKSn/pB4d/DxW5MzPgn2EHFxX6LTtGi/GXwM8XM62 2Mks/kWlk/rl+HRD97GDb3NAhv85Eyyam2GL1O8nd7Y8LEhI26LN6zopth5q5TQB/EsRQz 7vQhcq1KhgKEhIJTqSBBR3z4M+XSLe9F4TThkB5Ew8i1kEduXoE9CHNJ5nDJuw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935374; b=Pfbx4HeOtg/PpXrebm9qzpY2Ik6DdSqb3MIul3fQI1V2gVpWj/JBICz81LUoa2cTJQr+we 0+NiAlu3hRGufsLsuZrclrR8Ah0l+VokINoJm57ymNPHRJxzRgpdL1mdw5d194i85KGHqy izOd20IROopaH+S6Qv1Sm6AOXdvgQVpfeluuzmNR3bMoaejzexC9xjO3SXPDpqlBXhV1EJ HXOT+bKecHUrclJO/w3ye8JY65SuPajUDgTJjtmJN0Uqa+pLBTBkTZpqRTCXVMfWU9K0Wy Ycrp/wrovFof0jUC+92NdT3g9afYSuztfD53n9lGovf9NhRke7YrNK5RsFyXlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935374; 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=kTfN/nI52JHuN4AdQJ+R+8e3IU+RZLj/iFVOr9UCADs=; b=XPk1X0l31D73EcgmqjrUb0nsygEtl8qI3nN3wnfsKGefL2zk1xf08kKjFvZPn9wWMJhoAL PaMX1anwYqQN7/xoJGk0kGXS8QtrT65+ONnKbjPz6ddEO9vkHypxDlGNihF523//ET2v+D GJnI6nyxBmhXgQLTbx8mlaHBRPLt4r/rJOV6+9Mrk1D1VgsveZX1NonXJD6BipaxmuJD1P aNXDVNEcguqQ3GGxTPyOewY6IhEwrElMbOX8vg3l6kMVB3AF4egd+7cZ2tcJ9VnmbHAS6j bRAQZr3Euz8/x07WAublsqfclh+CZzXELxK9cptC8k1lbQkzA3o2XZTK+q0Lnw== 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 4jTWRy1kMpzrkS for ; Tue, 17 Nov 2026 17:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d172 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:34 +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: 954f20253644 - releng/15.2 - 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/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 954f20253644a748b3a7895821ff57fd4bf18ec4 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:34 +0000 Message-Id: <6afc8a4e.1d172.608a1200@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=954f20253644a748b3a7895821ff57fd4bf18ec4 commit 954f20253644a748b3a7895821ff57fd4bf18ec4 Author: Rick Macklem AuthorDate: 2026-11-12 17:19:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:34:22 +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: re (cperciva) 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 9e64f3492939..14642d14447a 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -1743,7 +1743,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; @@ -1761,7 +1761,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; } @@ -1948,8 +1949,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 @@ -3470,8 +3470,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.