]> xenbits.xensource.com Git - xen.git/commitdiff
x86/vmx: Avoid hitting BUG_ON() after EPTP-related domain_crash()
authorAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 14 Sep 2018 11:26:38 +0000 (13:26 +0200)
committerJan Beulich <jbeulich@suse.com>
Fri, 14 Sep 2018 11:26:38 +0000 (13:26 +0200)
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@citrix.com>
Reviewed-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
master commit: 48dbb2dbe9d9f92a2890a15bb48a0598c065b9f8
master date: 2018-08-02 10:10:43 +0100

xen/arch/x86/hvm/vmx/vmx.c

index 7e509b039208cd7cbde46fdc6a7a41bb940b1d76..78f16546a51a648253bfade007886ab01bec0482 100644 (file)
@@ -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;
             }
         }