From nobody Wed Aug 5 06:22:12 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 4hFL103ZB8z6mhQR for ; Wed, 05 Aug 2026 06:22:12 +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 4hFL102ZFJz3bq8 for ; Wed, 05 Aug 2026 06:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785910932; 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=gUz6J4FtQtygGqcpYwcGrUsW+Bt0e2CxdbWKdLA4Q9M=; b=kav+clJfvN9MF2rm9bO8OjmcPvtru+wUIklenFttWy/p305fOf9rd1OLQXxiVVgAJ1pHwC 1Sas23b0Tb9gAjiVE2ofEF2yLfQeo/+Z4yoyzh7fSpxjIIO5zQmumuivb3n+YU9j/kq7xS YGXdSKvDK/GqK1BmO3YMty8y0X7oNH/0/GBtqo2SbR1RveFRln5XndQp0b5vbUdfHAYLGf 5jFT4Gx6/tluaKi0N/nPBYZRQ8bZL2fqn25jOMdpdGJvvshewOZ9FWLXTY4xlARF+01XD2 dSmkFzbKTL9b9pkPT9tW1DfV2i6BaFzZ6GemYKqHuabAck+/bbNnsnq6ufGhDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785910932; a=rsa-sha256; cv=none; b=sD+a+vaG6/iOOG+ivjRDJBwIRhl0bf4AHJn0+L3eNm9xyh2Ws3IoQlFS7WoSVoiRdbKx2a gcxmw7uAArmQsaYtBxakkhO930mwiWtb1nf0TIIIYGJLByrTnEf19n22RFxd5/hdJLxv3y Zel6B1t91xCVbfX7w6PP0CifzQjIPRjsLPftBn9TXbDMUHt7gPvMVVVkTfZch/++d6ORiM 2f1hLbKsLjq/ZeFtSwsfsGD1bVemTLngRFotpAD0WsvpYD/yfhW8FQslaViIZCqxZoR2Rb LIvfqx2IM2ibExrAXLgQ2yr0A5VeoYejtXCIh8zobJiktnvuaUFg72sHGmF1WA== 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=1785910932; 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=gUz6J4FtQtygGqcpYwcGrUsW+Bt0e2CxdbWKdLA4Q9M=; b=xUNmsWtisnHUrAaC8NQU/Brfs0zNLj804GmuzEelExyl3ncZbum8aD/+AK89rt0QMRzNDM 65b66+VJ4S2ePr2yn+5rWXNcxrlwHbw0n8AOncJ1aQdHGg/LWVYnCXQtJMUivBjBNKvqSA xqfbioS12u8yqsi56QPz/LjbJ4W0ku6GK+OMxm9WrwjwbALSmM+FMHM6vbyqc2EZIy69Ma vXspFmfPUJ76aVtBjw+yfCwyhZWu9ED0WOTuWhdP5fpN3M7dzH0H4moUZqn0hWGiFlg/iF 5kuO7XpsEKmDZwldFmBSD33dXSywCNcuPFExWofEy5H7S+C0vniexN8NNol5Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFL101PGfz5ss for ; Wed, 05 Aug 2026 06:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23f5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 06:22:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: aea04a88aaa9 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: aea04a88aaa9a61d0049eb5db39188c39267217f Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 06:22:12 +0000 Message-Id: <6a72d694.23f5a.36e6f808@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aea04a88aaa9a61d0049eb5db39188c39267217f commit aea04a88aaa9a61d0049eb5db39188c39267217f Author: Konstantin Belousov AuthorDate: 2026-07-30 03:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-05 06:08:57 +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 dddf9eb59223..12562968a4e3 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -573,13 +573,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; @@ -589,7 +592,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) @@ -598,6 +601,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 */ @@ -617,12 +622,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); } /*