From nobody Tue Nov 17 17:09:44 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 4jTWS95nGyz71SkH for ; Tue, 17 Nov 2026 17:09:45 +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 4jTWS85wKhz4QMW for ; Tue, 17 Nov 2026 17:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935384; 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=V8x2ASySpIHMnHS/V3yyN3tXqMUiqtMW5w7oXK5a+Kc=; b=Y36TJTpK0S8Jpp8n7F85Kh6uYqdveCFdZlbmjJcTKn7L9Z4g9d/Nx+MoysL5yTk3y0hsdh HAV5E+9etD52B+aZL6m83ykp7sQLbkhI4WROQvSqYzFRCZ0ZFN3JAS9JjgzISiPndCPFqw xo7OPyTa4ROyvPy3ot04T0RTIird21ay8gZrVBf25J7Dlt4jkZT5Kvdh0dkZ5hdaK1jjuH jSY4ohVu0EFkg34F7Xo9G+NjpiNPdbZEocyND9BbyZfOgjEcS3ZinHrAfFU7ki75xgxg9q 92LnVCTmzu9sYwXY3junxwVqQ5gPi7qrfal50v22wQrzDH3ZDRUPt2GdQPrZZQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935384; b=ojePNFbPrd3rI0bfAcqzx4WhtnMxtf9sjBqz+X2Zo8f/LX7x5Mr5SMNjBjtB0XnsdAq9aX klg9Vw9Jlxv/d7Ar+YaMcRNEeQFLak3kZZVJPhmoeXMH8alj4EBDvNQACMyld3iQq8KpFd shh60FRbGS6hZZNVEmhrKodvvc4xyM/hrgD+sJMvaokNggIAon/QsV4QHO+OLj36oFivB7 KRYRZQ3O6+lzNejbfQoRmHPAczvYnfAqCnTQ1TUu93RrTKMjsLnghWzTCloTQKmVaoBup4 Ytt5bdPbGMvzqD2rxlrrDEUD7gKXRUsggy2YHOLhiFtnv+0f1adnvUXna65SNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935384; 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=V8x2ASySpIHMnHS/V3yyN3tXqMUiqtMW5w7oXK5a+Kc=; b=p2IhwTKLIpoVwYNKM7lNnsrjaoyFlwq9QYsUjJsKQgLWr+YLUbMkS95tylOwzzxDofGTDw 1LmaiE4vy9hmXDWpHJo4SgOe9Uupv3SQQviOLV8TpRFkcTTxrYyfS4Hjh7EnqDxFW/UgzS PPwI1201EZE7I8AHir2iOHO2HILi2TslGpCrfCsNZKtqTpnL4NvH6O11yb+W53aV8G02na N6dCDtJZwJyRVQGoe7J79mIgSEztXnpzR1nbmJEjVwF9dcToy8fJ+L6ZAGcReIZMVQteqm txYdbTk7VhLoUDNYJEY5gjmvcF0X8nM06Y++dt5HrMNk8DFvLMqRI3q8cPvC5w== 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 4jTWS85bRyzrkZ for ; Tue, 17 Nov 2026 17:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e4ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:09:44 +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: 01b73c604511 - releng/15.2 - 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/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 01b73c60451102288ea974589f0c4ca4dd267b17 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:09:44 +0000 Message-Id: <6afc8a58.1e4ff.2680294@gitrepo.freebsd.org> The branch releng/15.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=01b73c60451102288ea974589f0c4ca4dd267b17 commit 01b73c60451102288ea974589f0c4ca4dd267b17 Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:35:31 +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: re (cperciva) 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 40dbec290f2d..1f9fbb0e0b0d 100644 --- a/sys/amd64/vmm/intel/vmx_msr.c +++ b/sys/amd64/vmm/intel/vmx_msr.c @@ -492,7 +492,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