From nobody Tue Nov 17 17:04:13 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 4jTWKn5gfmz71R1r for ; Tue, 17 Nov 2026 17:04:13 +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 4jTWKn1rJ4z4Fkx for ; Tue, 17 Nov 2026 17:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935053; 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=vssKg1bBMH2DQbHhHTuqgutpyi7F0XW8k5n3M7WACWI=; b=IXUz7Gj0nOdTxZUS/WYJ8ZGNcz5fjtn4N2H2itasD5wvGwH6IEAg0axFrKfYFpYvg9xYbb L5e8/l0o2lWU/ek/wgW0bvPkGbyeBXNc4K137XandccqYxD/vX6sau936WVw+Dv9Xq5JLt bIRHw4p6+5n+JdCNQFKUHC6kjV71hfXKXbEphxocCPUdDvtYPtWJkCfrdf82/scbn0JJZ6 ypWtkx+tEnnQXlRhhA7GqDAa+79z0VeE9UTWS7/OxotH7+EAS1XALYgvkjX5rG5IEnLxWm VsCChQNqcHy7Bjjd7izi1IxoUlYC69qnr13lfnq+JI1Ak8O4iFi4+LIo/q7Dug== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935053; b=iFABrv4e8Oc78briGLVXJuyHaQAoX9B928nghpT8RJyQAbGcZIM/DPSj1t94VWiTNv7fMm ug7XN2pC8ejmzCHSqhyFdZ+CGa9nF3OrUa1cZ8aPTb4JV9SauYVBbHJLArGvdP5I4opbhO PmPtTtOCo5pXkvidl2fFBIQDhSjrQ0Y2JEqHCGazdzyyjc4FIwGR30U4CoGTgE0jL2qzy7 QOnp+m+y1VgZp82q3G9zDNdUyRo7fPOZfZcPrEP91/MAKLr85WIMigfynH1O3M1djTr6ns OPw2jhY8fXfPdk1LaDXhRoYqI9it0Apj+/4ZJDz4Rf41v6yHzMzYC5lIU/vFSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935053; 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=vssKg1bBMH2DQbHhHTuqgutpyi7F0XW8k5n3M7WACWI=; b=BdJhO/LIyPkiGOys/eRQgNkr8cybTJVvXOfXGyrZ/9LGcfLz+VICf/kEfQqfd6IjYkKIo/ 67GyhGNAMo3OqE8EiUN8eyuFbLsTBA2c6CIzWMjU59dJQ8QFAa2jlh9Xl9+CYMh/PQUglz xAvDm6FQABHgEi6vIiXzLZWlfl+FvyscYs005i05LA8glrblGdx3iwPPlhlall1gBvKy0V Rjy2n4P6Qq+5M3LnND42dUPPFa4VeW1s0cNkDgUBny51Ydi6I9JMA3K7hgkF+o4g6baZqg mtxv40j5N3wHXrQRxsfvx69nRRpLk+RYytxSaxHu7vRPUS8hRoAqWlDzaSbihA== 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 4jTWKn1VP6zr6c for ; Tue, 17 Nov 2026 17:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d155 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:04:13 +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: 4d152e66a764 - releng/14.4 - 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/14.4 X-Git-Reftype: branch X-Git-Commit: 4d152e66a764bc61212b050b79e1328968045821 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:04:13 +0000 Message-Id: <6afc890d.1d155.d84a71b@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d152e66a764bc61212b050b79e1328968045821 commit 4d152e66a764bc61212b050b79e1328968045821 Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:16:22 +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