Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.19/110-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)
changeset 1992 eebcaff6626f
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.
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
crosstool-ng