From nobody Tue Nov 17 17:06:03 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 4jTWMw2RPdz71RdG for ; Tue, 17 Nov 2026 17:06:04 +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 4jTWMv5RNLz4J8l for ; Tue, 17 Nov 2026 17:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935163; 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=Z/vo+67wHpqTcV+s+nUVyGooHZ1r4FkuFGdze5WGIRw=; b=Gvl7+eSfyLHBcHnrHY3TfUecZToILoS4HrxUtgMvjwFgIvqGf/GIigDslw4k908dBB3qGd zfC7hbi2e6MhbIdx13GVD7cfciBIbv2yNY+LfY/ledvTRSRKLzDqE+pdaKstJ4z0skSZot OGaAc846l6YAzViyWGUBOXpOhtPsQE3qfTlTYgKa3tV5TtWvsEFgQX3HzU/8LhzmhNseLL /4QT8xal2hbZq/J5Bvt+ascu76L9DRjyPHkognvC8GcTYi3sEVRornu9x9AoH7whDsQMWl 28+McRErCJi8v/G5w39YP1Xfif6fG+a9CGU/24f53ASG/nXh/7fjcmO0hVzldg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935163; b=dKvvWzbVGNnfHxgkvsjb6a0ohVAh0DLfTdpbQ3tSiNXXb9WY5N1UUjyHtO2kNhnO3dEW/c b6l50c8ApwMW1tPHaSrdUcFJfSybmtpFKrFe5DF/OmyHYrGejNHeMtXqEQ/RVCqp4Qq2ap nuxXvHA2oCie2EtUzYKaMPF1xKNIliaplZHei4U1nSUgdCsOAH7wRLD7UiMG/dGFIVtY2T wtpJL+Gpi4a8z3Zr+G67UQFdH0w/27RwY5QoqGbmhfSWUgJotPBtwmorIpuAdioDBfD2EX biLr9fWRq0iZ/RcxWTa3YBfDYn/tOjY9x5e6LhMT5LV1jbuz/rsJ2Mk/zvx/HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935163; 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=Z/vo+67wHpqTcV+s+nUVyGooHZ1r4FkuFGdze5WGIRw=; b=g1WItJ9JXW6wd4YVW3/+buw6ZDIm+C/cvyh8hmuVU0byJt1Uja5H8MrdyPZgFAwJ75VM9o ckpMlEO1pQ1VWmVZ2MVWVZZy/AW2FlbtiIDdqqIEho3mN6ymLaC8mGkzUjhOxMpnjXxOCq eG9cKywAnI442Xvekx8v4PFGOXsdfh+ImXZA53h3DB7ZIvinJHfxxd+Ishye5pt/kG+Kag 0nsGjfmUV29zJTrYzGTE69OLMUcE6uFKk6Uw1h01nuSQzxrXTGvVg+gjqK6h47t0Wj93oS vtiQ9AE7baoI8aIaNJR4TbvrxPCFQF1dmwrtOoqJBGn5w3YNyuTsYq/mLQRubQ== 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 4jTWMv55Ydzrh6 for ; Tue, 17 Nov 2026 17:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e4db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:03 +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: d754bb7691a7 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: d754bb7691a73e543f1208ff5a9b53b96c6d01ea Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:03 +0000 Message-Id: <6afc897b.1e4db.b97aecc@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d754bb7691a73e543f1208ff5a9b53b96c6d01ea commit d754bb7691a73e543f1208ff5a9b53b96c6d01ea Author: Hayzam Sherif AuthorDate: 2026-11-05 11:53:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57: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 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