summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2008-12-09 16:07:22 +0100
committerAvi Kivity <avi@redhat.com>2008-12-31 15:55:46 +0100
commiteb64f1e8cd5c3cae912db30a77d062367f7a11a6 (patch)
tree9a0f0f9774211b77cf6b5c2e6914e6e88c7b42f1
parentKVM: Consolidate userspace memory capability reporting into common code (diff)
downloadlinux-eb64f1e8cd5c3cae912db30a77d062367f7a11a6.tar.xz
linux-eb64f1e8cd5c3cae912db30a77d062367f7a11a6.zip
KVM: MMU: check for present pdptr shadow page in walk_shadow
walk_shadow assumes the caller verified validity of the pdptr pointer in question, which is not the case for the invlpg handler. Fixes oops during Solaris 10 install. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/mmu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 863baf70506e..641c07844e6e 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1269,6 +1269,8 @@ static int walk_shadow(struct kvm_shadow_walk *walker,
if (level == PT32E_ROOT_LEVEL) {
shadow_addr = vcpu->arch.mmu.pae_root[(addr >> 30) & 3];
shadow_addr &= PT64_BASE_ADDR_MASK;
+ if (!shadow_addr)
+ return 1;
--level;
}