Commit e4fe9e7d authored May 16, 2016 by Matt Evans Committed by Christoffer Dall May 20, 2016

kvm: arm64: Fix EC field in inject_abt64



The EC field of the constructed ESR is conditionally modified by ORing in
ESR_ELx_EC_DABT_LOW for a data abort.  However, ESR_ELx_EC_SHIFT is missing
from this condition.

Signed-off-by: Matt Evans <matt.evans@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

parent 06485053

arch/arm64/kvm/inject_fault.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
		esr \|= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);

		if (!is_iabt)
		esr \|= ESR_ELx_EC_DABT_LOW;
		esr \|= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;

		vcpu_sys_reg(vcpu, ESR_EL1) = esr \| ESR_ELx_FSC_EXTABT;
		}