lkml.org 
[lkml]   [2015]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 20/78] MIPS: KVM: Fix CACHE immediate offset sign extension
    Date
    3.13.11-ckt32 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: James Hogan <james.hogan@imgtec.com>

    commit c5c2a3b998f1ff5a586f9d37e154070b8d550d17 upstream.

    The immediate field of the CACHE instruction is signed, so ensure that
    it gets sign extended by casting it to an int16_t rather than just
    masking the low 16 bits.

    Fixes: e685c689f3a8 ("KVM/MIPS32: Privileged instruction/target branch emulation.")
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Gleb Natapov <gleb@kernel.org>
    Cc: linux-mips@linux-mips.org
    Cc: kvm@vger.kernel.org
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    [ luis: backported to 3.16:
    - file rename: emulate.c -> kvm_mips_emul.c ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/mips/kvm/kvm_mips_emul.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/kvm_mips_emul.c
    index e75ef82..4d88db7 100644
    --- a/arch/mips/kvm/kvm_mips_emul.c
    +++ b/arch/mips/kvm/kvm_mips_emul.c
    @@ -935,7 +935,7 @@ kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc, uint32_t cause,

    base = (inst >> 21) & 0x1f;
    op_inst = (inst >> 16) & 0x1f;
    - offset = inst & 0xffff;
    + offset = (int16_t)inst;
    cache = (inst >> 16) & 0x3;
    op = (inst >> 18) & 0x7;

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-17 02:21    [W:4.163 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site