From nobody Tue Nov 17 17:05:11 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 4jTWLw51Vgz71RSg for ; Tue, 17 Nov 2026 17:05:12 +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 4jTWLw0Cnyz4H7H for ; Tue, 17 Nov 2026 17:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935112; 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=QjjZvSXpro6M2cjd+ntPeuUJh4G8cwNk/Z+wlfeNSRE=; b=vPL95SkFYpwnxTDPoNkYzWDdra3A1ZSswlAt8m5YC11JMFcdaDO5EBJaivRtu9jY7rACa3 O2l4rmEn08azTvXjpLHoOYkMu3XClwfLMXUW9sqtFmN/HMTscnAx85uzlGkqp6AqUc7kwD i6ViL+/cLIctXOC2Y/z/fo6lRwPBf/3ZBQLmbVrrxm5RMy/L5VydvEAo5lwrnnC7G9Mnfr +QeHSnOP+ZLoOnKEjFe/HvZBqsTD79B09xyxrurKMJM8OhYy5TX4d87SHD2Rhn4XYtH+zR aIot4kqnHhlcGYoA7zs1Fm/zbZjZC/am1bw6KKx96tq1eApnBvLRU5q/cS1doA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935112; b=E7ZKKLwdiFAsm7JCXn3yDydjsO2D9zlhl0/e0eO0IniLnRvENfbqiQDt+s94D3o6g0gkjA YBdbFEauzZv2G82J7/b3RoQ45BwVh26E1fwfj0VnhA9CrrADaLo1pnAqinw6kEg9IWNCXk HGnQB2yOme2W5+J1qVe8BPP4PilxJcMe9iaJfTS7MTLnw5TnO969nZNsTKwzMjzbmypW6k 2C7fHf9S+bcYFx/UJnSNG7WYd32w/B06svIa6Rnj83p1DLIdTnPH6mVpNKQyFpmPagThrN l91LTqZ/km7oijA5p2DYE/+0M4ftZozBQLGx+BuL3ayc7Z9uWZTZ425YnF/r9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935112; 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=QjjZvSXpro6M2cjd+ntPeuUJh4G8cwNk/Z+wlfeNSRE=; b=Am2abMyDW0DQG8+5UXn1LRIumKfGB/CEPdNMMeVpoUeJ7bS6OOUN7cmljndFLx3VBw0Kcd wQZXXyrKQ9YK4wJYZpGURNaHm7kzCuhIc/Ne1HsUwSV5QS6eEkLB2dLSRlkna2GnxUnvzR 6xVoIrj6Dc0ThvgtxAptPxFaKs4Sn6TWwK4ale6zkBwe4kbsISifbrI4sZcxCUvpeVWojQ 68cWe4lrTdYpNuVGxcXGGhinIJG6ixPPjoSV/Zo6GnhktzCHnY4IJYvkZUbb9qSH9qFDA1 C4kajllfGl6J/PknOQTwBl5HFZgcbozyFHu10DuXGiZijuli/ZelENDMpI5fww== 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 4jTWLv6zb9zrm4 for ; Tue, 17 Nov 2026 17:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f7be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:11 +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: 198357a7298a - releng/14.5 - 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.5 X-Git-Reftype: branch X-Git-Commit: 198357a7298a42469dd8db612f60b0711807646f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:11 +0000 Message-Id: <6afc8947.1f7be.3c7b9608@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=198357a7298a42469dd8db612f60b0711807646f commit 198357a7298a42469dd8db612f60b0711807646f Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:17:12 +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