From nobody Wed Aug 5 06:27:25 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 4hFL721pZhz6mhtw for ; Wed, 05 Aug 2026 06:27:26 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFL720MXwz3d5v for ; Wed, 05 Aug 2026 06:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785911246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEOeYOBeThsi+IyyTFscJpxlwLGdhgw3Hlnd8VXJma0=; b=DTmwVC9xf1ea9Ixrmgeg1b/bPiDpCdVi/FkCp57M8/ElbixPqAtQbupYUYaxjZj5keQKcl zAnFftd8bFsknYGqWmcIMPZegdr2P3cQ6XIyRXfVM35s9Llcw0jXGBIHTq5eNgkdB0Wobq V3p/E8XemlLpMWhfZkOEPAE5Avostmd3oVPnVLuI9nk8wc0gOFtD+E48Vjoxfeu+ghzaKe OUeBuDm2ja5/nSJgIcrUVDNgzM3lNkEMNF4pj7srnlWOPpvXNAOoAIwTU4DCtdNx7DITWw tkYxe+fT464Q+FrzgtGwEEkKV0PDSXNaXulGjBFLQGubw5htBj7jUS8+XKhcXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785911246; a=rsa-sha256; cv=none; b=m/TaECTmXygfgUGMvjPazmh4GRSmuTMLY28e4Zg6GzHZevSzaEM2H4VsD88DClT4JLM2I4 dropSL0+5vv1xFoJM8AN8Hp4ICXjyYPVbYi9k9PewEJXQXT8Kb7MRZKpzLwKrAPY7ffEcd tw3CJnJsVRISnVnzRV4rUxrLxsqWTerkIZqgH3MfmO+WAYt1cRGjbjdRkCy6a/XlWjkwOI HcLqJaTUBwMBwb492+q1Ljrf3Xrpqagse5jC1NmP4HyapRK1x5jDlm1qimZWt04hcIGGwJ wfFHg4M+fzUmdxTuP+NHuSTmm4Q4WV3Fzq1EH9nD+mM8ZdxUAMs9sC/3mWDtHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785911246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UEOeYOBeThsi+IyyTFscJpxlwLGdhgw3Hlnd8VXJma0=; b=U0o071uGyzlGfa/StTL4Pv6ZAmpuqrIj5moUbyQmaixLCKGB1TNUamU7rQegFpKw1usKup STyRTzRMXVqdECX0vp0PxfuJNyfJPzqWM8n12M8z3BP1otMuIMjthyz8jUSJ3wIiZNZ/xX oihelZAcJx3GWtoh7GMQNsK1+ETT01vgiHK7UZTubQpSFWj3B0TFAV3Jz7Mdqo/Tbvgvyj wa66F3Uh9UBT/TXfSCd8GfQByyyZykr//D5dA/Vo6HahaQ9iWteQ8YWoLm0Ppyf/UyzTzU e5W+4Fj54Pk31cmm/4/m2k2Jc5HXlQhU1gsa22HSY3txIBCwRbRzmyGgLORTMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFL7162mWz6kF for ; Wed, 05 Aug 2026 06:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 06:27:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2f9a4885ec99 - stable/14 - amd64: do not allow to set reserved bits in MXCSR for ptrace(PT_SETFPREGS) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f9a4885ec995e8ea53b42a820fbd9c337a2a907 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 06:27:25 +0000 Message-Id: <6a72d7cd.25cae.dab3198@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f9a4885ec995e8ea53b42a820fbd9c337a2a907 commit 2f9a4885ec995e8ea53b42a820fbd9c337a2a907 Author: Konstantin Belousov AuthorDate: 2026-07-30 03:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-05 06:23:16 +0000 amd64: do not allow to set reserved bits in MXCSR for ptrace(PT_SETFPREGS) (cherry picked from commit cef05c5a62ba63eda222eed083972bfaa1449ac2) --- sys/amd64/amd64/exec_machdep.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index b9c69b7d5a2f..0158afda247f 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -533,13 +533,16 @@ fill_fpregs_xmm(struct savefpu *sv_xmm, struct fpreg *fpregs) } /* internalize from fpregs into sv_xmm */ -static void +static int set_fpregs_xmm(struct fpreg *fpregs, struct savefpu *sv_xmm) { struct envxmm *penv_xmm = &sv_xmm->sv_env; struct envxmm *penv_fpreg = (struct envxmm *)&fpregs->fpr_env; int i; + if ((penv_fpreg->en_mxcsr & ~cpu_mxcsr_mask) != 0) + return (EINVAL); + /* fpregs -> pcb */ /* FPU control/status */ penv_xmm->en_cw = penv_fpreg->en_cw; @@ -549,7 +552,7 @@ set_fpregs_xmm(struct fpreg *fpregs, struct savefpu *sv_xmm) penv_xmm->en_rip = penv_fpreg->en_rip; penv_xmm->en_rdp = penv_fpreg->en_rdp; penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr; - penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask; + penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask; /* FPU registers */ for (i = 0; i < 8; ++i) @@ -558,6 +561,8 @@ set_fpregs_xmm(struct fpreg *fpregs, struct savefpu *sv_xmm) /* SSE registers */ for (i = 0; i < 16; ++i) bcopy(fpregs->fpr_xacc[i], sv_xmm->sv_xmm[i].xmm_bytes, 16); + + return (0); } /* externalize from td->pcb */ @@ -577,12 +582,14 @@ fill_fpregs(struct thread *td, struct fpreg *fpregs) int set_fpregs(struct thread *td, struct fpreg *fpregs) { + int error; critical_enter(); - set_fpregs_xmm(fpregs, get_pcb_user_save_td(td)); - fpuuserinited(td); + error = set_fpregs_xmm(fpregs, get_pcb_user_save_td(td)); + if (error == 0) + fpuuserinited(td); critical_exit(); - return (0); + return (error); } /*