[PATCH] ARM: KVM: Don't corrupt r{8,9}_fiq

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



r{8,9}_fiq share the same offset in vcpu_reg_offsets, which will
lead to corruption if anyone decides to use FIQ in a guest (not
that I would condone the idea...).

Untested, but probably less incorrect than the original code.

Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
 arch/arm/kvm/emulate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/kvm/emulate.c b/arch/arm/kvm/emulate.c
index fc0fcd3..08fe117 100644
--- a/arch/arm/kvm/emulate.c
+++ b/arch/arm/kvm/emulate.c
@@ -35,7 +35,7 @@ static const unsigned long vcpu_reg_offsets[MODE_SYS + 1][16] = {
 		USR_REG_OFFSET(0), USR_REG_OFFSET(1), USR_REG_OFFSET(2),
 		USR_REG_OFFSET(3), USR_REG_OFFSET(4), USR_REG_OFFSET(5),
 		USR_REG_OFFSET(6), USR_REG_OFFSET(7),
-		REG_OFFSET(fiq_regs[1]), /* r8 */
+		REG_OFFSET(fiq_regs[0]), /* r8 */
 		REG_OFFSET(fiq_regs[1]), /* r9 */
 		REG_OFFSET(fiq_regs[2]), /* r10 */
 		REG_OFFSET(fiq_regs[3]), /* r11 */
-- 
1.7.12



_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm


[Index of Archives]     [Linux KVM]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux