FAILED: patch "[PATCH] MIPS: KVM: Fix CACHE immediate offset sign extension" failed to apply to 3.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
c5c2a3b998f1ff5a586f9d37e154070b8d550d17Mon Sep 17 00:00:00 2001
From: James Hogan <[email protected]>
Date: Wed, 11 Nov 2015 14:21:19 +0000
Subject: [PATCH] MIPS: KVM: Fix CACHE immediate offset sign extension
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 <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Gleb Natapov <[email protected]>
Cc <[email protected]> # 3.10.x-
Signed-off-by Paolo Bonzini <[email protected]>
arch/mips/kvm/emulate.c +1 -1
@@ -1581,7 +1581,7 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc, base = (inst >>21 ) &0x1f ; op_inst = (inst >>16 ) &0x1f ; - offset = inst &0xffff ; + offset = (int16_t )inst; cache = (inst >>16 ) &0x3 ; op = (inst >>18 ) &0x7 ;