patches/strace/4.5.19/110-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13)
branch1.13
changeset 2847 c0bf2319af08
permissions -rw-r--r--
scripts: fix dumping execution backtrace

Dumping the backtrace has been broken since changeset #652e56d6d35a:
scripts: execute each steps in a subshell

We can spawn sub-sub-shells in some cases.

The way the fault handler works is to dump the backtrace, but to avoid
printing it once for every sub-shell (which could get quite confusing),
it simply exits when it detects that it is being run in a sub-shell,
leaving to the top-level shell the work to dump the backtrace.

Because each step is executed in its own sub-shell, the variable arrays
that contain the step name, the source file and line number, are lost
when exiting the per-step sub-shell.

Hence, the backtrace is currently limited to printing only the top-level
main procedure of the shell.

Fix this thus:
- when dumping the bckatraces for the steps & the functions, remember
it was dumped, and only dump it if it was not already dumped
- at the top-level shell, print the hints

Also, rename the top-level step label.

Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4193d6e6a17430a177fa88c287879c2c35e319f3)
     1 diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c
     2 --- strace-4.5.19.orig/syscall.c	2009-10-12 21:54:21.000000000 +0200
     3 +++ strace-4.5.19/syscall.c	2009-10-28 18:47:18.000000000 +0100
     4 @@ -1022,6 +1022,15 @@
     5  		/*
     6  		 * Note: we only deal with only 32-bit CPUs here.
     7  		 */
     8 +
     9 +		if (!(tcp->flags & TCB_INSYSCALL) &&
    10 +		    (tcp->flags & TCB_WAITEXECVE)) {
    11 +			/* caught a fake syscall from the execve's exit */
    12 +			tcp->flags &= ~TCB_WAITEXECVE;
    13 +			return 0;
    14 +		}
    15 +
    16 +
    17  		if (regs.ARM_cpsr & 0x20) {
    18  			/*
    19  			 * Get the Thumb-mode system call number