Commit d9118c87 authored Apr 03, 2017 by Marc Zyngier Committed by Christoffer Dall Apr 09, 2017

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>

parent af42f204

arch/arm/kernel/hyp-stub.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -215,8 +215,10 @@ __hyp_stub_do_trap:
		beq __hyp_stub_exit

		ldr r0, =HVC_STUB_ERR
		__ERET

		__hyp_stub_exit:
		mov r0, #0
		__ERET
		ENDPROC(__hyp_stub_do_trap)

arch/arm/kvm/init.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -155,8 +155,10 @@ reset:
		b exit

		1: ldr r0, =HVC_STUB_ERR
		eret

		exit:
		mov r0, #0
		eret
		ENDPROC(__kvm_handle_stub_hvc)