From 54c0bb27e5ce61acabe9af578469d87adab9c2af Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 23 Oct 2012 09:13:27 +0200 Subject: [PATCH] nestedsvm: fix memory leak on shutdown/crash Fix memory leak of l1 vmcb page when destroying a vcpu while l2 guest is running. Signed-off-by: Christoph Egger Acked-by: Tim Deegan Committed-by: Jan Beulich --- xen/arch/x86/hvm/svm/nestedsvm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 9f69bcc70f..e48db005e6 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -122,6 +122,15 @@ void nsvm_vcpu_destroy(struct vcpu *v) struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct nestedsvm *svm = &vcpu_nestedsvm(v); + /* + * When destroying the vcpu, it may be running on behalf of l2 guest. + * Therefore we need to switch the VMCB pointer back to the l1 vmcb, + * in order to avoid double free of l2 vmcb and the possible memory leak + * of l1 vmcb page. + */ + if (nv->nv_n1vmcx) + v->arch.hvm_svm.vmcb = nv->nv_n1vmcx; + if (svm->ns_cached_msrpm) { free_xenheap_pages(svm->ns_cached_msrpm, get_order_from_bytes(MSRPM_SIZE)); -- 2.30.2