Re: [PATCH 2/3] KVM: x86: set ctxt->have_exception in x86_decode_insn()

[Jan Dakinevich]

On Tue, 27 Aug 2019 07:53:58 -0700
Sean Christopherson <sean.j.christopherson@xxxxxxxxx> wrote:

> On Tue, Aug 27, 2019 at 01:07:08PM +0000, Jan Dakinevich wrote:
> > x86_emulate_instruction() takes into account ctxt->have_exception flag
> > during instruction decoding, but in practice this flag is never set in
> > x86_decode_insn().
> > 
> > Fixes: 6ea6e84 ("KVM: x86: inject exceptions produced by x86_decode_insn")
> > Cc: Denis Lunev <den@xxxxxxxxxxxxx>
> > Cc: Roman Kagan <rkagan@xxxxxxxxxxxxx>
> > Cc: Denis Plotnikov <dplotnikov@xxxxxxxxxxxxx>
> > Signed-off-by: Jan Dakinevich <jan.dakinevich@xxxxxxxxxxxxx>
> > ---
> >  arch/x86/kvm/emulate.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> > index 6170ddf..f93880f 100644
> > --- a/arch/x86/kvm/emulate.c
> > +++ b/arch/x86/kvm/emulate.c
> > @@ -5395,6 +5395,8 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
> >  					ctxt->memopp->addr.mem.ea + ctxt->_eip);
> >  
> >  done:
> > +	if (rc == X86EMUL_PROPAGATE_FAULT)
> > +		ctxt->have_exception = true;
> 
> We should add a sanity check or two on the vector since the emulator code
> goes all over the place, e.g. #UD should not be injected/propagated, and
> trap-like exceptions should not be handled/encountered during decode.
> Note, exception_type() also warns on illegal vectors.
> 
>   WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR ||
> 	       exception_type(ctxt->exception.vector) == EXCPT_TRAP);

Ok.

> 
> >  	return (rc != X86EMUL_CONTINUE) ? EMULATION_FAILED : EMULATION_OK;
> >  }
> >  
> > -- 
> > 2.1.4
> > 


-- 
Best regards
Jan Dakinevich