diff options
| author | James Hogan <james.hogan@imgtec.com> | 2015-12-11 17:06:54 +0000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-12-14 11:26:54 +0100 |
| commit | 33ae9c415d1988b9a26ae72c7dc6eb8c94d04772 (patch) | |
| tree | 1d81a7b4bfbf3370890727038406912982431710 | |
| parent | a667d58f97543daae4c9410d5da0a56988343d9c (diff) | |
| download | lwn-33ae9c415d1988b9a26ae72c7dc6eb8c94d04772.tar.gz lwn-33ae9c415d1988b9a26ae72c7dc6eb8c94d04772.zip | |
MIPS: KVM: Fix CACHE immediate offset sign extension
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: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/mips/kvm/kvm_mips_emul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/kvm_mips_emul.c index c76f297b7149..33085819cd89 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; |