From nobody Tue Nov 17 17:02:49 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 4jTWJB2G20z71QCW for ; Tue, 17 Nov 2026 17:02:50 +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 4jTWJ95T34z4BH4 for ; Tue, 17 Nov 2026 17:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934969; 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=fvdhr/srtD/YS8itQ6df8/VUNKBpZWV+4KLaca80RQA=; b=jLbbeiDM6XakzDAHeAvjBDoJD5cr2SvqN1siFxRN9BelucxEmnsv1exT0CV/fWSlH2+ik4 QRmI0aMNdPDEbeDZJ/izqCgAKxZIU+hnZJTzF/wEZefGNGw5D431M3ZxHb0yZaCKDstB05 Lc+2Z8YUUQ0FX7MexF+uvgxaK7RFT5/m7vYOg+sEmmyz2Db/aTZBymG8+sk8hbgSe4v3pr uL8S8IRyPQ3l5ZtZ3p9jt8scEpZWNqlZhDf8vdd/ljLFXjKRrJg8c4AsqCJNz+Zf5iRf4k uf9lPRFP516zYzonCNq/5pwM0zbedK5fN2muH5C/mdfRDYC5jU5NlSJyu65hug== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934969; b=ANeKmODaiyM2hdG9uHWQxC12zJ250FGFZXdPiNhtJtL/Kf1d2a+qA4FcemKY4QIutUfB1g PgaP1sx6qTi7dy/dlH02nx4MPWlCjD0qhUOhuUUUzJbbM0GZraHH96UGSv1bcLwOTRf9EI lLVoTV+H0sAfLz60PwHJAYCwYm/+Au9p64tcwoW0WeeBtB+l7/tvfNUChxp3OssK9VmQiX lGPF6VMnn51TMcgwQDKMEivc85SB18E6JzoLI7Stdca/3sZ/XJfs38mCyjc2BsflwsA4En de1kpm3bNPYd2CnblSGNLr6qO0sviD3sThMgCfHkTIp2HzJLSWf2uV5ZfNU+1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934969; 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=fvdhr/srtD/YS8itQ6df8/VUNKBpZWV+4KLaca80RQA=; b=pM5OSUmmPN3Q6Vg1dQCB2P2mHu1eg9wIQcqUzCJ9TZ80ilJ8KGbAaTTMkanEi7FhQobUhO uvXUiDLrgopVLqwQ5XWTOQ/CoyxZBwFqoArh7P8qNptYLw3KjQ/bPCdYFtxzHYxOTndLPi ab0kPUcS7VSaA2uo7Vc+6A0isAJMvo5YQL8KNMUpW7HDshUtcQ3BochS776PYSHYL0aZYT H0X2Pv6EyUYVG1MjacGVKGkairmMWNM5Mx9a3IR1Ie+L4qhUC6g8WdMDP4GHQ/P02wckbN SWrbU3hpli60oykJByALAHVOjTZFrZKPelsxU9UC2njtZixSu8OZlKydG/hqlg== 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 4jTWJ94X2DzrM6 for ; Tue, 17 Nov 2026 17:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e913 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: aa2389453a9c - stable/14 - amd64/vmm: Reject TSC_AUX writes with reserved bits set 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: aa2389453a9c3ebaeffdf7fba1f9fea8afe2185b Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:49 +0000 Message-Id: <6afc88b9.1e913.f22bef3@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa2389453a9c3ebaeffdf7fba1f9fea8afe2185b commit aa2389453a9c3ebaeffdf7fba1f9fea8afe2185b Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:10 +0000 amd64/vmm: Reject TSC_AUX writes with reserved bits set On Intel CPUs, bits 63:32 of IA32_TSC_AUX are reserved. Guest writes to the MSR are trapped and the value is stored in the vCPU's MSR array. vmx_msr_guest_enter_tsc_aux() later writes the value to the physical MSR, so reserved bits must be rejected before the value reaches the host MSR. Inject #GP into the guest instead, as the hardware would. Approved by: so Security: FreeBSD-SA-26:84.vmm Security: CVE-2026-101319 Fixes: f5f5f1e7d6de ("Support guest rdtscp and rdpid instructions on Intel VT-x") Sponsored by: Alchemilla Ventures Private Limited --- sys/amd64/vmm/intel/vmx_msr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c index ba110e088e25..ed846348db21 100644 --- a/sys/amd64/vmm/intel/vmx_msr.c +++ b/sys/amd64/vmm/intel/vmx_msr.c @@ -493,7 +493,11 @@ vmx_wrmsr(struct vmx_vcpu *vcpu, u_int num, uint64_t val, bool *retu) error = vmx_set_tsc_offset(vcpu, val - rdtsc()); break; case MSR_TSC_AUX: - if (vmx_have_msr_tsc_aux) + /* + * Bits 63:32 are reserved. Reject them here, since the + * value is later written to the host's MSR. + */ + if (vmx_have_msr_tsc_aux && (val >> 32) == 0) /* * vmx_msr_guest_enter_tsc_aux() will apply this * value when it is called immediately before guest