[xen master] x86/HVM: correct repeat count update in linear->phys translation

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] x86/HVM: correct repeat count update in linear->phys translation

patchbot
commit 49160d205236d8e36d27d40b6bf69b9b75f2c333
Author:     Jan Beulich <[hidden email]>
AuthorDate: Fri Sep 8 16:23:46 2017 +0200
Commit:     Jan Beulich <[hidden email]>
CommitDate: Fri Sep 8 16:23:46 2017 +0200

    x86/HVM: correct repeat count update in linear->phys translation
   
    For the insn emulator's fallback logic in REP INS/OUTS handling
    to work correctly, *reps must not be set to zero when returning
    X86EMUL_UNHANDLEABLE.
   
    Signed-off-by: Jan Beulich <[hidden email]>
    Reviewed-by: Andrew Cooper <[hidden email]>
    Acked-by: Paul Durrant <[hidden email]>
---
 xen/arch/x86/hvm/emulate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
index 64454c7..54811c1 100644
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -566,15 +566,16 @@ static int hvmemul_linear_to_phys(
             if ( pfec & (PFEC_page_paged | PFEC_page_shared) )
                 return X86EMUL_RETRY;
             done /= bytes_per_rep;
-            *reps = done;
             if ( done == 0 )
             {
                 ASSERT(!reverse);
                 if ( npfn != gfn_x(INVALID_GFN) )
                     return X86EMUL_UNHANDLEABLE;
+                *reps = 0;
                 x86_emul_pagefault(pfec, addr & PAGE_MASK, &hvmemul_ctxt->ctxt);
                 return X86EMUL_EXCEPTION;
             }
+            *reps = done;
             break;
         }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog