Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.15/120-fix-arm-bad-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 22 23:49:23 2010 +0200 (2010-06-22)
branch1.7
changeset 1998 110ba570a70a
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts/wrapper: fix wrong test when checking access to the reall tool

In C, the proper syntax for a bit-wise OR is a single '|', not two.

It worked so far because all was well:
- X_OK == 1
- R_OK||X_OK == 1
- the file we searched for had the x-bit set
-> access( file, R_OK||X_OK ) worked
- inicidentally, the file we searched for also had the r-bit set,
but we were not testing that in fact.
(transplanted from eebcaff6626f09af4f69b7b06f1246a06769d0af)
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
crosstool-ng