summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 20:38:06 +0200
committerChristoffer Dall <cdall@linaro.org>2017-04-09 16:49:36 +0200
commitd9118c87d21ee799058a55eeae84d392ae887c91 (patch)
tree6e8afb42ef2aaec6102052e87cc76142bb065266 /arch/arm/kvm
parentarm64: hyp-stub: Zero x0 on successful stub handling (diff)
downloadlinux-d9118c87d21ee799058a55eeae84d392ae887c91.tar.xz
linux-d9118c87d21ee799058a55eeae84d392ae887c91.zip
ARM: hyp-stub: Zero r0 on successful stub handling
We now return HVC_STUB_ERR when a stub hypercall fails, but we leave whatever was in r0 on success. Zeroing it on return seems like a good idea. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/init.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index 87bcd7ae4552..570ed4a9c261 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -155,8 +155,10 @@ reset:
b exit
1: ldr r0, =HVC_STUB_ERR
+ eret
exit:
+ mov r0, #0
eret
ENDPROC(__kvm_handle_stub_hvc)