Re: [PATCH] KVM: x86: Avoid emulating instructions on #UD mistakenly

[Nadav Amit]

Correction: the word “never” in the message is too harsh.
Nonetheless, there is a regression bug. I encountered it with “wrfsbase” instruction.

Nadav

On Aug 13, 2014, at 4:50 PM, Nadav Amit <namit@xxxxxxxxxxxxxxxxx> wrote:

> Commit d40a6898e5 mistakenly caused instructions which are not marked as
> EmulateOnUD to be emulated upon #UD exception. The commit caused the check of
> whether the instruction flags include EmulateOnUD to never be evaluated. As a
> result instructions whose emulation is broken may be emulated.  This fix moves
> the evaluation of EmulateOnUD so it would be evaluated.
> 
> Signed-off-by: Nadav Amit <namit@xxxxxxxxxxxxxxxxx>
> ---
> arch/x86/kvm/emulate.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index 56657b0..37a83b2 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -4394,6 +4394,9 @@ done_prefixes:
> 
>  	ctxt->execute = opcode.u.execute;
> 
> +	if (!(ctxt->d & EmulateOnUD) && ctxt->ud)
> +		return EMULATION_FAILED;
> +
>  	if (unlikely(ctxt->d &
>  		     (NotImpl|EmulateOnUD|Stack|Op3264|Sse|Mmx|Intercept|CheckPerm))) {
>  		/*
> @@ -4406,9 +4409,6 @@ done_prefixes:
>  		if (ctxt->d & NotImpl)
>  			return EMULATION_FAILED;
> 
> -		if (!(ctxt->d & EmulateOnUD) && ctxt->ud)
> -			return EMULATION_FAILED;
> -
>  		if (mode == X86EMUL_MODE_PROT64 && (ctxt->d & Stack))
>  			ctxt->op_bytes = 8;
> 
> -- 
> 1.9.1
>

Attachment: signature.asc
Description: Message signed with OpenPGP using GPGMail