summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 21:38:05 +0300
committerChristoffer Dall <cdall@linaro.org>2017-04-09 17:49:35 +0300
commitaf42f20480bf13d9dbf099ccca65f3de8c44fcaf (patch)
treefda8f02af6f84242bbbedaa5a99185fdc05055e5
parent0b51c547fdb7ee05b6d65471785a1d899c8a667c (diff)
downloadlinux-af42f20480bf13d9dbf099ccca65f3de8c44fcaf.tar.xz
arm64: hyp-stub: Zero x0 on successful stub handling
We now return HVC_STUB_ERR when a stub hypercall fails, but we leave whatever was in x0 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>
-rw-r--r--arch/arm64/kernel/hyp-stub.S4
-rw-r--r--arch/arm64/kvm/hyp-init.S6
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index d55604d91e33..e1261fbaa374 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -73,8 +73,10 @@ el1_sync:
/* Someone called kvm_call_hyp() against the hyp-stub... */
ldr x0, =HVC_STUB_ERR
+ eret
-9: eret
+9: mov x0, xzr
+ eret
ENDPROC(el1_sync)
.macro invalid_vector label
diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S
index 3734e6315cd7..839425c24b1c 100644
--- a/arch/arm64/kvm/hyp-init.S
+++ b/arch/arm64/kvm/hyp-init.S
@@ -154,13 +154,13 @@ reset:
/* Install stub vectors */
adr_l x5, __hyp_stub_vectors
msr vbar_el2, x5
- b exit
+ mov x0, xzr
+ eret
1: /* Bad stub call */
ldr x0, =HVC_STUB_ERR
-
-exit:
eret
+
ENDPROC(__kvm_handle_stub_hvc)
.ltorg