kvm: fix page struct leak in handle_vmon

Orabug: 25482167
CVE: CVE-2017-2596

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>
(cherry picked from commit 06ce521af9558814b8606c0476c54497cf83a653)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
Conflicts:
	arch/x86/kvm/vmx.c

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index d260cdb38fd616cb18edd75db0b634727677984b..7cc375b07f0b389582a7bff233474236bc798e26 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6512,14 +6512,20 @@ 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);
+                       skip_emulated_instruction(vcpu);
+                       return 1;
+               }
+               if (*(u32 *)kmap(page) != VMCS12_REVISION) {
                        kunmap(page);
+                       nested_release_page_clean(page);
+                       nested_vmx_failInvalid(vcpu);
                        skip_emulated_instruction(vcpu);
                        return 1;
                }
                kunmap(page);
+               nested_release_page_clean(page);
                vmx->nested.vmxon_ptr = vmptr;
                break;
        case EXIT_REASON_VMCLEAR: