File xsa203.patch of Package xen.3878
x86/HVM: add missing NULL check before using VMFUNC hook
This is XSA-203.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Index: xen-4.7.1-testing/xen/arch/x86/hvm/emulate.c
===================================================================
--- xen-4.7.1-testing.orig/xen/arch/x86/hvm/emulate.c
+++ xen-4.7.1-testing/xen/arch/x86/hvm/emulate.c
@@ -1643,6 +1643,8 @@ static int hvmemul_vmfunc(
{
int rc;
+ if ( !hvm_funcs.altp2m_vcpu_emulate_vmfunc )
+ return X86EMUL_UNHANDLEABLE;
rc = hvm_funcs.altp2m_vcpu_emulate_vmfunc(ctxt->regs);
if ( rc != X86EMUL_OKAY )
hvmemul_inject_hw_exception(TRAP_invalid_op, 0, ctxt);