From nobody Thu Jul 30 17:08:57 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 4h9wf65bWZz6mgZH for ; Thu, 30 Jul 2026 17:09:02 +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 4h9wf64DFpz428b for ; Thu, 30 Jul 2026 17:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785431342; 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=KgW9XqRMiF7zITo7MnEPCIrhqQRNJsjc7b71yKOOf6E=; b=e4dBB48FhTo3guoxN9SQaUoobs9kh+f3Cs5yAh7y+mqN61CNRxkSTvFq/EUJ96Iy5H8okb 96nVxwszC8oWVEgHoev1VugEebzEVSplolttAI2RX0L2OBCmSCURzXESGwIAYRt0N/2JdO u+wX2f7NraItKiwOmdvPrdltY6h4XQuA+CqfCKAJUYjZ6f+ULmQ8qkykk2BqSFBeaz8PNU 8ZhOcwXXeBSGJ8CWNdxC5LnZZaVSOo66mcPtKckEumSDFU21qNopauphDGvoIjglB7uZV4 L7hDN4PeetvyJNt4q91asIjd58Ph2aLbcB/4k04U5G+CCF6U4PuigF+AsmZgtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785431342; a=rsa-sha256; cv=none; b=F9GxnJ/OO2s3n2oG6FkOwYxATD5n0gLMXcHfjuUZ5ln7ZGiUGvp+7Ig3R+CZSa3IkNE0YM PSYiTA1QCOVaVJfKxVQsta2ifv6L+BVVxrXq0IO6xT1eMG56lBwqSMxBl+n0UX+oOymJPM QKB1KvRT/GZd0BL5AxNJiBY3S2R9+DgIuIR120UMN7hTNCvQLY23X+HMzNZ7QyIp3xgxkX BCEWMFhnZPJnzNzecVfZPKAHKV7TykOqMcyUUR39MEmsrrVWSsxNckm0JgO7fCbBGx4Xye WtmUtKaUJsVWRHXq9NGZBM5v7sRFFzBoSZWbhnQfovk1ribeJAxw901VIIPDhA== 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=1785431342; 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=KgW9XqRMiF7zITo7MnEPCIrhqQRNJsjc7b71yKOOf6E=; b=b+uZ3aSzMOn1+YPxx09bXdkh3YmsGcZ6lgKByHivrVKZ6ug0abiu0uR+3amy1TydbdvWsP 5JYkZ2PEnG+bbVlwmnw6LjO4Okr62sAa3do03zOOaj1Br2VoP7bVkAJ3i9LUYdzIOV5v+5 xeVjpKOUco59YN6rlY7znNFHIcBBB++78FBNIAONYVDJwihTNBgQx5VAI1XEkZVryzGBBG eNCpGysdt4kCW/S59sD6Iwy1DIDOX5Ub50uzG57IDTt6tfjd7UsY3EvvNStXq2GHKEjkGf AvpajOD5i5qqHmH1+RzssT+Vb8wFNsaAy24SY73DQe6tJkqIKghRMhjUTdubIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9wf62zhjz6gG for ; Thu, 30 Jul 2026 17:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ffc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Jul 2026 17:08:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cef05c5a62ba - main - 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/main X-Git-Reftype: branch X-Git-Commit: cef05c5a62ba63eda222eed083972bfaa1449ac2 Auto-Submitted: auto-generated Date: Thu, 30 Jul 2026 17:08:57 +0000 Message-Id: <6a6b8529.37ffc.4a3cb6ac@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cef05c5a62ba63eda222eed083972bfaa1449ac2 commit cef05c5a62ba63eda222eed083972bfaa1449ac2 Author: Konstantin Belousov AuthorDate: 2026-07-30 03:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-30 17:08:24 +0000 amd64: do not allow to set reserved bits in MXCSR for ptrace(PT_SETFPREGS) Also do not mask bits in the mxcsr_mask. It is ignored by FRSTOR/XRSTOR. Reported by: markj Reviewed by: jhb, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58548 --- 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 f81fc5f94406..d5d3342b7dff 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); } /*