| Index: src/trusted/service_runtime/arch/arm/nacl_switch.S
|
| diff --git a/src/trusted/service_runtime/arch/arm/nacl_switch.S b/src/trusted/service_runtime/arch/arm/nacl_switch.S
|
| index 68dc305cab1b9906e0250218f4fb871e91697aaa..04b703c3ad32501a3bad6a67e841f73d4865aa69 100644
|
| --- a/src/trusted/service_runtime/arch/arm/nacl_switch.S
|
| +++ b/src/trusted/service_runtime/arch/arm/nacl_switch.S
|
| @@ -22,13 +22,14 @@
|
| DEFINE_GLOBAL_HIDDEN_IDENTIFIER(NaClSwitch):
|
|
|
| /*
|
| - * We clear registers r2, r3, lr, flag and status fields in CPSR
|
| - * (status register) to avoid information leaks. The remaining
|
| + * We clear registers r2, r3, r12 (ip), lr, flag and status fields in
|
| + * CPSR (status register) to avoid information leaks. The remaining
|
| * registers are overwritten by the code that follows after.
|
| */
|
|
|
| mov r2, #0
|
| mov r3, #0
|
| + mov r12, #0
|
| mov lr, #0
|
| msr cpsr_fs, #0
|
|
|
|
|