[Xen-changelog] [qemu-upstream-unstable] target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT

[patchbot@xxxxxxx]

commit 3750d2588e8d8d204820fef4ce95d7c271bafd3f
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Thu Feb 5 13:37:23 2015 +0000
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Sun Feb 22 18:38:35 2015 -0600

    target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT
    
    The LDT/STT (load/store unprivileged) instruction decode was using
    the wrong MMU index value. This meant that instead of these insns
    being "always access as if user-mode regardless of current privilege"
    they were "always access as if kernel-mode regardless of current
    privilege". This went unnoticed because AArch64 Linux doesn't use
    these instructions.
    
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Reviewed-by: Greg Bellows <greg.bellows@xxxxxxxxxx>
    Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xxxxxxxxxx>
    ---
    I'm not counting this as a security issue because I'm assuming
    nobody treats TCG guests as a security boundary (certainly I
    would not recommend doing so...)
    
    (cherry picked from commit 949013ce111eb64f8bc81cf9a9f1cefd6a1678c3)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 target-arm/translate-a64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index 80d2c07..97206aa 100644
--- a/target-arm/translate-a64.c
+++ b/target-arm/translate-a64.c
@@ -2107,7 +2107,7 @@ static void disas_ldst_reg_imm9(DisasContext *s, uint32_t 
insn)
         }
     } else {
         TCGv_i64 tcg_rt = cpu_reg(s, rt);
-        int memidx = is_unpriv ? 1 : get_mem_index(s);
+        int memidx = is_unpriv ? MMU_USER_IDX : get_mem_index(s);
 
         if (is_store) {
             do_gpr_st_memidx(s, tcg_rt, tcg_addr, size, memidx);
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog