diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2018-02-06 20:56:07 +0300 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-02-07 01:53:52 +0300 |
commit | f5115e8869e1dfafac0e414b4f1664f3a84a4683 (patch) | |
tree | f0a24b9245dfa58519e61d7de6b15d5d69331f0e /virt | |
parent | 20e8175d246e9f9deb377f2784b3e7dfb2ad3e86 (diff) | |
download | linux-f5115e8869e1dfafac0e414b4f1664f3a84a4683.tar.xz |
arm64: KVM: Increment PC after handling an SMC trap
When handling an SMC trap, the "preferred return address" is set
to that of the SMC, and not the next PC (which is a departure from
the behaviour of an SMC that isn't trapped).
Increment PC in the handler, as the guest is otherwise forever
stuck...
Cc: stable@vger.kernel.org
Fixes: acfb3b883f6d ("arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls")
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions