| From c5c2a3b998f1ff5a586f9d37e154070b8d550d17 Mon Sep 17 00:00:00 2001 |
| From: James Hogan <james.hogan@imgtec.com> |
| Date: Wed, 11 Nov 2015 14:21:19 +0000 |
| Subject: MIPS: KVM: Fix CACHE immediate offset sign extension |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/mips/kvm/emulate.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/mips/kvm/emulate.c |
| +++ b/arch/mips/kvm/emulate.c |
| @@ -1581,7 +1581,7 @@ enum emulation_result kvm_mips_emulate_c |
| |
| base = (inst >> 21) & 0x1f; |
| op_inst = (inst >> 16) & 0x1f; |
| - offset = inst & 0xffff; |
| + offset = (int16_t)inst; |
| cache = (inst >> 16) & 0x3; |
| op = (inst >> 18) & 0x7; |
| |