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