[Xen-changelog] [xen stable-4.9] x86/vmx: Avoid hitting BUG_ON() after EPTP-related domain_crash()

[patchbot@xxxxxxx]

commit 5bb24b27924ba2b339cc79f57f224a4bf5c74313
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Sep 14 13:26:38 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Sep 14 13:26:38 2018 +0200

    x86/vmx: Avoid hitting BUG_ON() after EPTP-related domain_crash()
    
    If the EPTP pointer can't be located in the altp2m list, the domain
    is (legitimately) crashed.
    
    Under those circumstances, execution will continue and guarentee to hit the
    BUG_ON(idx >= MAX_ALTP2M) (unfortunately, just out of context).
    
    Return from vmx_vmexit_handler() after the domain_crash(), which also has 
the
    side effect of reentering the scheduler more promptly.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>
    Acked-by: Kevin Tian <kevin.tian@xxxxxxxxx>
    master commit: 48dbb2dbe9d9f92a2890a15bb48a0598c065b9f8
    master date: 2018-08-02 10:10:43 +0100
---
 xen/arch/x86/hvm/vmx/vmx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 7e509b0392..78f16546a5 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -3696,6 +3696,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs)
             {
                 gdprintk(XENLOG_ERR, "EPTP not found in alternate p2m list\n");
                 domain_crash(v->domain);
+
+                return;
             }
         }
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.9

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog