patches/strace/4.5.15/200-strace-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Sep 05 11:20:38 2008 +0000 (2008-09-05)
branch1.2
changeset 842 c359aa844414
permissions -rw-r--r--
Backport #975 from trunk:
Warn the user if he/she recalls a sample with EXPERIMENTAL features.
Also, print the EXPERIMENTAL status when listing the samples.

NB: even it is not purely a fix backport, it is still very important that the user gets warned about the EXPERIMENTAL status of the samples.

/branches/1.2/scripts/showSamples.sh | 17 14 3 0 ++++++++++++++---
/branches/1.2/samples/samples.mk | 12 12 0 0 ++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
yann@257
     1
diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
yann@257
     2
--- strace-4.5.15.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
yann@257
     3
+++ strace-4.5.15/syscall.c	2007-07-14 19:21:44.000000000 +0200
yann@257
     4
@@ -1045,6 +1045,15 @@
yann@257
     5
 		/*
yann@257
     6
 		 * Note: we only deal with only 32-bit CPUs here.
yann@257
     7
 		 */
yann@257
     8
+
yann@257
     9
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@257
    10
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@257
    11
+			/* caught a fake syscall from the execve's exit */
yann@257
    12
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@257
    13
+			return 0;
yann@257
    14
+		}
yann@257
    15
+ 
yann@257
    16
+
yann@257
    17
 		if (regs.ARM_cpsr & 0x20) {
yann@257
    18
 			/*
yann@257
    19
 			 * Get the Thumb-mode system call number