From nobody Tue Nov 17 17:01:50 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 4jTWH32PNrz71QBG for ; Tue, 17 Nov 2026 17:01:51 +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 4jTWH26qdGz3Q0L for ; Tue, 17 Nov 2026 17:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934911; 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=8fogO68fdh6GIReu6wex6cueZ0wEBngJWK9vIe3FQ+Y=; b=Ba3k01Bk9xqKuwps/zpvWymyrkrN6kjNfeEiquIfAe0aCL6wHcyq1xjRerVEXOZY0i0uvJ xB+i9Cy4uvSQ3zSsNRn0kXjdZdQUePlZvb6YVoMl/brmOk+j9tc0VIpVggLYQ3Y7mtxtt0 o3NNgNb+s0SmvKzvTo8azo9rO5xVYRQ3+rw56w593PV36CLsIORGd/QJ/DcQ/t5L3NGqeL /iRiLpNatkcnMNUAhn572FFRmXKTXqHJj12i8O1M5EhbI1nn9fAk//gpT77C9WpGb4uN+g Eia3cHXVliX1WIhHJTqunvxazSDYa6EJFKw36xCUEHMvyQZFF2sjX330kxMJkw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934911; b=nvBeBf2Tb4Eoyy8eYr/8GFO4CpRDEN/pwXIp8Kq2HZpF1nDXUhC2axdXGoUPN0IeJanA3e FIANq/NfbSX3qswkZCB1pYGuB0DHYm6nGDD8tO7wyXq3cePUJQslx2ABZ1bfyQhDhZZk5v rWZf2oR/K/CDbzk8DA0bAXY3loaMiIBdYSsBuYMm4OcJocsgNBYC2vYO4ZylwkStCO+2z4 cbpnKKYItwzTP+ugfQaRWSWHDd+Oc7ri8uzogfgPLWg6QnqIQMWR0X228FYpjUxsmhEn2N u93uH24M+Bu0cXaZ9OLss9LhhVrtBxJQC9rPSOPcu+KHL7zu3mII9qsQztXVTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934911; 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=8fogO68fdh6GIReu6wex6cueZ0wEBngJWK9vIe3FQ+Y=; b=rpBZ+HCN0HA6oYuLQ21exAsWiHA0d0nwARAVndm71zJVb69Nyz74dMxnrYE4wlduAM9f2m 3LADQkA5Ybb06/C0aMZt1FFLTbO0NqTzy5Kmn+/e4jHHW1gRZ+2aZhMLThdRifXiGMUxFE qcduEDNVO03di7oLiO+1efv9NRgjIwiNH9LapJsLO9Iz/rNR02gLY6Q45bH3T42pEFq4G8 tOQXRaBb6a8myiMYqskeNpL+uopQS+kSnElLI86embScteRi2Iet26dsTzrSPA8ezzj2Kb PODZWbr4eLRivvxRyCENcvhlb0s7LnFR4UH4PmuO2186bWJDXzNSE+xc3DHZ4w== 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 4jTWH25PN7zrR4 for ; Tue, 17 Nov 2026 17:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e30c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 1fcaded0010e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1fcaded0010ea9301430563490054c44e38f900f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:50 +0000 Message-Id: <6afc887e.1e30c.f95edc@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1fcaded0010ea9301430563490054c44e38f900f commit 1fcaded0010ea9301430563490054c44e38f900f Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +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 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