head 1.2; access; symbols pkgsrc-2016Q4:1.1.0.2 pkgsrc-2016Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2017.03.20.18.17.13; author bouyer; state dead; branches; next 1.1; commitid d3qkVwbNTy4nKjKz; 1.1 date 2016.12.21.15.36.39; author bouyer; state Exp; branches; next ; commitid MbsrinMfW9QZIRyz; desc @@ 1.2 log @Update xenkernel46 and xentools46 to 4.6.5. Changes since 4.6.3: various bug fixes. Includes all security patches up to and including XSA-209 @ text @$NetBSD: patch-XSA-203,v 1.1 2016/12/21 15:36:39 bouyer Exp $ From: Jan Beulich Subject: x86/HVM: add missing NULL check before using VMFUNC hook This is XSA-203. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/emulate.c.orig +++ 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); @ 1.1 log @Add patches from upstream fixing XSA-202 and XSA-203 Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-XSA-195,v 1.1 2016/11/22 20:57:10 bouyer Exp $ @