diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2013-06-25 11:12:35 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:34:24 -0700 |
| commit | effef64525b96b3b5b871a19dfe068cd865eb09c (patch) | |
| tree | ef59df278171cd6a10742db83f7669b8d7d74d4e /security/tlk_driver/ote_comms.c | |
| parent | 09745b57d5f9b4cc57a9bc6ca0e428ec6e918446 (diff) | |
security: tlk_driver: use local stack for context save/restore
With secure storage there is a situation when we getback from the SMC call,
but find that the stack is completely corrupted due to SVC handling in the
kernel. To avoid such scenarios, use a local stack to save/restore our context.
Bug 1291402
Change-Id: If7d4c336aa0cc664b7c7f7134becb68d03e22ece
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/241681
(cherry picked from commit 4fb8a5f59ce565cb684d9aaa816a465d7c3a5d04)
Reviewed-on: http://git-master/r/249872
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Aaron Gamble <jgamble@nvidia.com>
Diffstat (limited to 'security/tlk_driver/ote_comms.c')
| -rw-r--r-- | security/tlk_driver/ote_comms.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/security/tlk_driver/ote_comms.c b/security/tlk_driver/ote_comms.c index fc9744ad3766..693650c0d566 100644 --- a/security/tlk_driver/ote_comms.c +++ b/security/tlk_driver/ote_comms.c @@ -191,27 +191,31 @@ static void te_unpin_temp_buffers(struct te_request *request, } } -uint32_t __naked tlk_generic_smc(uint32_t arg0, uint32_t arg1, uint32_t arg2) +uint32_t tlk_generic_smc(uint32_t arg0, uint32_t arg1, uint32_t arg2) { + uint32_t saved_regs[9]; register uint32_t r0 asm("r0") = arg0; register uint32_t r1 asm("r1") = arg1; register uint32_t r2 asm("r2") = arg2; + register uint32_t r3 asm("r3") = (uint32_t)saved_regs; asm volatile( __asmeq("%0", "r0") __asmeq("%1", "r0") __asmeq("%2", "r1") __asmeq("%3", "r2") - "stmfd sp!, {r4-r12} @ save reg state\n" + __asmeq("%4", "r3") + "stmia r3, {r4-r12} @ save reg state\n" #ifdef REQUIRES_SEC ".arch_extension sec\n" #endif "smc #0 @ switch to secure world\n" - "ldmfd sp!, {r4-r12} @ restore saved regs\n" - "bx lr" + __asmeq("%4", "r3") + "ldmia r3, {r4-r12} @ restore saved regs\n" : "=r" (r0) - : "r" (r0), "r" (r1), "r" (r2) + : "r" (r0), "r" (r1), "r" (r2), "r" (r3) ); + return r0; } |