From: "Radim Krčmář" <rkrcmar@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH] KVM: x86: restrict maximal physical address
Date: Fri, 25 Nov 2016 15:51:05 +0100 [thread overview]
Message-ID: <20161125145105.9508-1-rkrcmar@redhat.com> (raw)
The guest could have configured a maximal physical address that exceeds
the host. Prevent that situation as it could easily lead to a bug.
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
arch/x86/kvm/cpuid.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 25f0f15fab1a..aed910e9fbed 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -136,7 +136,13 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)
((best->eax & 0xff00) >> 8) != 0)
return -EINVAL;
- /* Update physical-address width */
+
+ /*
+ * Update physical-address width.
+ * Make sure that it does not exceed hardware capabilities.
+ */
+ if (cpuid_query_maxphyaddr(vcpu) > boot_cpu_data.x86_phys_bits)
+ return -EINVAL;
vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
kvm_pmu_refresh(vcpu);
--
2.10.2
next reply other threads:[~2016-11-25 14:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 14:51 Radim Krčmář [this message]
2016-11-25 15:11 ` David Hildenbrand
2016-11-25 16:14 ` Radim Krčmář
2016-11-25 16:43 ` David Hildenbrand
2016-11-29 16:53 ` Radim Krčmář
2016-11-25 16:10 ` Paolo Bonzini
2016-11-25 16:57 ` Radim Krčmář
2016-11-25 17:21 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161125145105.9508-1-rkrcmar@redhat.com \
--to=rkrcmar@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®