diff mbox

[5/5] arm64: KVM: Fix guest dead loop when register accessor returns false

Message ID 1453977038-13516-6-git-send-email-marc.zyngier@arm.com
State Accepted
Commit 6327f35a2010c06a3bc2bfb14202a38764fb9920
Headers show

Commit Message

Marc Zyngier Jan. 28, 2016, 10:30 a.m. UTC 
From: Shannon Zhao <shannon.zhao@linaro.org>


Currently emulate_cp will return 0 (Handled) no matter what the accessor
returns. If register accessor returns false, it will not skip current PC
while emulate_cp return handled. Then guest will stuck in a dead loop.

Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

---
 arch/arm64/kvm/sys_regs.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
2.1.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff mbox

Patch

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 4048934..2e90371 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1007,10 +1007,9 @@  static int emulate_cp(struct kvm_vcpu *vcpu,
 		if (likely(r->access(vcpu, params, r))) {
 			/* Skip instruction, since it was emulated */
 			kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
+			/* Handled */
+			return 0;
 		}
-
-		/* Handled */
-		return 0;
 	}
 
 	/* Not handled */