From 6f0bded2b6d13bc3f35a7bf4f93193c0908be33e Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 15 Nov 2012 22:12:17 +0100 Subject: [PATCH] --- yaml --- r: 339515 b: refs/heads/master c: ad75b51459ae076a0d406391496f81b897bf6992 h: refs/heads/master i: 339513: c42501b7e5dfb48d1971a26297783bbfb7b31a77 339511: 41e71b71f4d7c2a370c7bee15ac0821983b0530f v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/entry-common.S | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 184417451657..ebb40383f4e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b790d71d58be65f9508ab60920eb978af828412 +refs/heads/master: ad75b51459ae076a0d406391496f81b897bf6992 diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index b621871dd277..ee81dbc6fa10 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -448,7 +448,10 @@ __sys_trace: ldmccia r1, {r0 - r6} @ have to reload r0 - r6 stmccia sp, {r4, r5} @ and update the stack args ldrcc pc, [tbl, scno, lsl #2] @ call sys_* routine - b 2b + cmp scno, #-1 @ skip the syscall? + bne 2b + add sp, sp, #S_OFF @ restore stack + b ret_slow_syscall __sys_trace_return: str r0, [sp, #S_R0 + S_OFF]! @ save returned r0