patches/strace/4.5.19/110-fix-arm-bad-syscall.patch
author Zhenqiang Chen <zhenqiang.chen@linaro.org>
Mon Dec 30 23:15:02 2013 +0100 (2013-12-30)
changeset 3261 3b61be3d7aa6
permissions -rw-r--r--
kernel/linux: prepare for arch whose kenel name is not the standard name

For some architectures, the kernel architecture name is not the common
name of the architecture for other tools.

For example: ARM 64-bit is commonly referenced as aarch64, but the kernel
calls it arm64.

Signed-off-by: Michael Hope <michael.hope@linaro.org>
Signed-off-by: Zhenqiang Chen <zhenqiang.chen@linaro.org>
[yann.morin.1998@free.fr: split out of the aarch64 patch]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@1613
     1
diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c
yann@1613
     2
--- strace-4.5.19.orig/syscall.c	2009-10-12 21:54:21.000000000 +0200
yann@1613
     3
+++ strace-4.5.19/syscall.c	2009-10-28 18:47:18.000000000 +0100
yann@1613
     4
@@ -1022,6 +1022,15 @@
yann@1613
     5
 		/*
yann@1613
     6
 		 * Note: we only deal with only 32-bit CPUs here.
yann@1613
     7
 		 */
yann@1613
     8
+
yann@1613
     9
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@1613
    10
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@1613
    11
+			/* caught a fake syscall from the execve's exit */
yann@1613
    12
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@1613
    13
+			return 0;
yann@1613
    14
+		}
yann@1613
    15
+
yann@1613
    16
+
yann@1613
    17
 		if (regs.ARM_cpsr & 0x20) {
yann@1613
    18
 			/*
yann@1613
    19
 			 * Get the Thumb-mode system call number