patches/strace/4.5.18/120-fix-arm-bad-syscall.patch
author Johannes Stezenbach <js@sig21.net>
Tue Oct 30 00:22:25 2012 +0000 (2012-10-30)
changeset 3097 5c67476c7342
permissions -rw-r--r--
scripts/functions: fix endless loop in debug-shell with IO redirection

CT_DEBUG_INTERACTIVE is disabled when stdin, stdout or
stderr are redirected, but the check is only done at
the start of the build and doesn't catch when individual
build commands use redirection. When stdin is redirected
it will cause the debug shell to exit immediately, causing
and endless loop. Thus, save the stdin/our/err file handles
and restore them before invoking the debug shell.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
Message-Id: <20121030102225.GA8303@sig21.net>
Patchwork-Id: 195409
yann@951
     1
diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
yann@951
     2
--- strace-4.5.16.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
yann@951
     3
+++ strace-4.5.16/syscall.c	2007-07-14 19:21:44.000000000 +0200
yann@951
     4
@@ -1045,6 +1045,15 @@
yann@951
     5
 		/*
yann@951
     6
 		 * Note: we only deal with only 32-bit CPUs here.
yann@951
     7
 		 */
yann@951
     8
+
yann@951
     9
+		if (!(tcp->flags & TCB_INSYSCALL) &&
yann@951
    10
+		    (tcp->flags & TCB_WAITEXECVE)) {
yann@951
    11
+			/* caught a fake syscall from the execve's exit */
yann@951
    12
+			tcp->flags &= ~TCB_WAITEXECVE;
yann@951
    13
+			return 0;
yann@951
    14
+		}
yann@951
    15
+
yann@951
    16
+
yann@951
    17
 		if (regs.ARM_cpsr & 0x20) {
yann@951
    18
 			/*
yann@951
    19
 			 * Get the Thumb-mode system call number