Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1565781

[PATCH] kvm: fix page struct leak in handle_vmon

Show all headers | View raw

handle_vmon gets a reference on VMXON region page,
but does not release it. Release the reference.

Found by syzkaller; based on a patch by Dmitry.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/vmx.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 42cc3d6f4d20..0f7345035210 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7085,13 +7085,18 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,
 		}
 
 		page = nested_get_page(vcpu, vmptr);
-		if (page == NULL ||
-		    *(u32 *)kmap(page) != VMCS12_REVISION) {
+		if (page == NULL) {
 			nested_vmx_failInvalid(vcpu);
+			return kvm_skip_emulated_instruction(vcpu);
+		}
+		if (*(u32 *)kmap(page) != VMCS12_REVISION) {
 			kunmap(page);
+			nested_release_page_clean(page);
+			nested_vmx_failInvalid(vcpu);
 			return kvm_skip_emulated_instruction(vcpu);
 		}
 		kunmap(page);
+		nested_release_page_clean(page);
 		vmx->nested.vmxon_ptr = vmptr;
 		break;
 	case EXIT_REASON_VMCLEAR:
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] kvm: fix page struct leak in handle_vmon Paolo Bonzini <pbonzini@redhat.com> - 2017-01-24 12:00 +0100
  Re: [PATCH] kvm: fix page struct leak in handle_vmon David Hildenbrand <david@redhat.com> - 2017-01-25 10:40 +0100
    Re: [PATCH] kvm: fix page struct leak in handle_vmon Paolo Bonzini <pbonzini@redhat.com> - 2017-01-25 11:00 +0100
      Re: [PATCH] kvm: fix page struct leak in handle_vmon David Hildenbrand <david@redhat.com> - 2017-01-25 11:00 +0100
        Re: [PATCH] kvm: fix page struct leak in handle_vmon David Hildenbrand <david@redhat.com> - 2017-01-25 11:20 +0100
          Re: [PATCH] kvm: fix page struct leak in handle_vmon Paolo Bonzini <pbonzini@redhat.com> - 2017-01-25 11:40 +0100
  Re: [PATCH] kvm: fix page struct leak in handle_vmon David Hildenbrand <david@redhat.com> - 2017-01-25 11:20 +0100

csiph-web