evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kvm: fix page struct leak in handle_vmon

Browse source 
commit 06ce521af9558814b8606c0476c54497cf83a653 upstream.

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>
[bwh: Backported to 3.16: use skip_emulated_instruction()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paolo Bonzini 2017-01-24 11:56:21 +01:00 • committed by Greg Kroah-Hartman
parent 98c953a0a5
commit c1fc1d2f21
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/kvm/vmx.c
View file

@ -6678,14 +6678,20 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,
} }
page = nested_get_page(vcpu, vmptr); page = nested_get_page(vcpu, vmptr);
if (page == NULL || if (page == NULL) {
*(u32 *)kmap(page) != VMCS12_REVISION) {
nested_vmx_failInvalid(vcpu); nested_vmx_failInvalid(vcpu);
skip_emulated_instruction(vcpu);
return 1;
}
if (*(u32 *)kmap(page) != VMCS12_REVISION) {
kunmap(page); kunmap(page);
nested_release_page_clean(page);
nested_vmx_failInvalid(vcpu);
skip_emulated_instruction(vcpu); skip_emulated_instruction(vcpu);
return 1; return 1;
} }
kunmap(page); kunmap(page);
nested_release_page_clean(page);
vmx->nested.vmxon_ptr = vmptr; vmx->nested.vmxon_ptr = vmptr;
break; break;
case EXIT_REASON_VMCLEAR: case EXIT_REASON_VMCLEAR: