| commit | cfa96b379cdd6561a5cc89f2bb86ee9f4b2a3928 | [log] [tgz] |
|---|---|---|
| author | Doug Kwan <dougkwan@google.com> | Thu Jul 29 13:04:29 2010 -0700 |
| committer | Doug Kwan <dougkwan@google.com> | Thu Jul 29 13:04:29 2010 -0700 |
| tree | 939cabf7dba44c5f551c55fb9937ae4376eca901 | |
| parent | fb19d317e61dfbb8234bb23d5c7cc40827667ec2 [diff] |
Fix strace by applying this patch from up-stream. 2007-11-01 Roland McGrath <roland@redhat.com> * syscall.c (get_scno) [ARM]: Check TCB_WAITEXECVE. Reported by Bernhard Fischer <rep.dot.nop@gmail.com>. Change-Id: Iba2a50fc1104bfe899163e975cf94745d72b4db6 http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commitdiff;h=9bc6340d21cb20d2c775863598068c1a29460eba
diff --git a/syscall.c b/syscall.c index 0958e1b..fa9c454 100644 --- a/syscall.c +++ b/syscall.c
@@ -1013,6 +1013,14 @@ * We only need to grab the syscall number on syscall entry. */ if (regs.ARM_ip == 0) { + if (!(tcp->flags & TCB_INSYSCALL)) { + /* Check if we return from execve. */ + if (tcp->flags & TCB_WAITEXECVE) { + tcp->flags &= ~TCB_WAITEXECVE; + return 0; + } + } + /* * Note: we only deal with only 32-bit CPUs here. */