Fix the length argument passed from print_iovec to decode_netlink

[strace] / syscall.c

diff --git a/syscall.c b/syscall.c
index 714fee715b005eea3a065ff9b893659aaf30623a..3e91880c956fa1924689dec90b562fc61e2802bd 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -76,6 +76,7 @@
 #define TP TRACE_PROCESS
 #define TS TRACE_SIGNAL
 #define TM TRACE_MEMORY
+#define TSF TRACE_STATFS
 #define NF SYSCALL_NEVER_FAILS
 #define MA MAX_ARGS
 #define SI STACKTRACE_INVALIDATE_CACHE
@@ -111,6 +112,7 @@ static const struct_sysent sysent2[] = {
 #undef TP
 #undef TS
 #undef TM
+#undef TSF
 #undef NF
 #undef MA
 #undef SI
@@ -553,6 +555,7 @@ clear_regs(void)
        get_regs_error = -1;
 }
 
+static void get_regs(pid_t pid);
 static int get_syscall_args(struct tcb *);
 static int get_syscall_result(struct tcb *);
 static int arch_get_scno(struct tcb *tcp);
@@ -596,7 +599,7 @@ tamper_with_syscall_entering(struct tcb *tcp, unsigned int *signo)
 
        if (opts->signo > 0)
                *signo = opts->signo;
-       if (opts->rval != INJECT_OPTS_RVAL_DISABLE && !arch_set_scno(tcp, -1))
+       if (opts->rval != INJECT_OPTS_RVAL_DEFAULT && !arch_set_scno(tcp, -1))
                tcp->flags |= TCB_TAMPERED;
 
        return 0;
@@ -638,11 +641,11 @@ tamper_with_syscall_exiting(struct tcb *tcp)
 static int
 trace_syscall_entering(struct tcb *tcp, unsigned int *sig)
 {
-       int res, scno_good;
-
-       scno_good = res = get_scno(tcp);
+       int res = get_scno(tcp);
        if (res == 0)
                return res;
+
+       int scno_good = res;
        if (res == 1)
                res = get_syscall_args(tcp);
 
@@ -747,14 +750,10 @@ syscall_tampered(struct tcb *tcp)
 static int
 trace_syscall_exiting(struct tcb *tcp)
 {
-       int sys_res;
        struct timeval tv;
-       int res;
-       unsigned long u_error;
-       const char *u_error_str;
 
        /* Measure the exit time as early as possible to avoid errors. */
-       if (Tflag || cflag)
+       if ((Tflag || cflag) && !(filtered(tcp) || hide_log(tcp)))
                gettimeofday(&tv, NULL);
 
 #ifdef USE_LIBUNWIND
@@ -764,12 +763,14 @@ trace_syscall_exiting(struct tcb *tcp)
        }
 #endif
 
+       if (filtered(tcp) || hide_log(tcp))
+               goto ret;
+
+       get_regs(tcp->pid);
 #if SUPPORTED_PERSONALITIES > 1
        update_personality(tcp, tcp->currpers);
 #endif
-       res = (get_regs_error ? -1 : get_syscall_result(tcp));
-       if (filtered(tcp) || hide_log(tcp))
-               goto ret;
+       int res = (get_regs_error ? -1 : get_syscall_result(tcp));
 
        if (syserror(tcp) && syscall_tampered(tcp))
                tamper_with_syscall_exiting(tcp);
@@ -811,7 +812,7 @@ trace_syscall_exiting(struct tcb *tcp)
        }
        tcp->s_prev_ent = tcp->s_ent;
 
-       sys_res = 0;
+       int sys_res = 0;
        if (tcp->qual_flg & QUAL_RAW) {
                /* sys_res = printargs(tcp); - but it's nop on sysexit */
        } else {
@@ -833,7 +834,7 @@ trace_syscall_exiting(struct tcb *tcp)
 
        tprints(") ");
        tabto();
-       u_error = tcp->u_error;
+       unsigned long u_error = tcp->u_error;
 
        if (tcp->qual_flg & QUAL_RAW) {
                if (u_error) {
@@ -845,6 +846,8 @@ trace_syscall_exiting(struct tcb *tcp)
                        tprints(" (INJECTED)");
        }
        else if (!(sys_res & RVAL_NONE) && u_error) {
+               const char *u_error_str;
+
                switch (u_error) {
                /* Blocked signals do not interrupt any syscalls.
                 * In this case syscalls don't return ERESTARTfoo codes.
@@ -910,7 +913,7 @@ trace_syscall_exiting(struct tcb *tcp)
                        break;
                }
                if (syscall_tampered(tcp))
-                       tprintf(" (INJECTED)");
+                       tprints(" (INJECTED)");
                if ((sys_res & RVAL_STR) && tcp->auxstr)
                        tprintf(" (%s)", tcp->auxstr);
        }
@@ -1061,6 +1064,7 @@ print_pc(struct tcb *tcp)
 #else
 # error Neither ARCH_PC_REG nor ARCH_PC_PEEK_ADDR is defined
 #endif
+       get_regs(tcp->pid);
        if (get_regs_error || ARCH_GET_PC)
                tprints(current_wordsize == 4 ? "[????????] "
                                              : "[????????????????] ");
@@ -1146,12 +1150,15 @@ ptrace_setregs(pid_t pid)
 
 #endif /* ARCH_REGS_FOR_GETREGSET || ARCH_REGS_FOR_GETREGS */
 
-void
+static void
 get_regs(pid_t pid)
 {
 #undef USE_GET_SYSCALL_RESULT_REGS
 #ifdef ptrace_getregset_or_getregs
 
+       if (get_regs_error != -1)
+               return;
+
 # ifdef HAVE_GETREGS_OLD
        /*
         * Try PTRACE_GETREGSET/PTRACE_GETREGS first,
@@ -1218,6 +1225,8 @@ free_sysent_buf(void *ptr)
 int
 get_scno(struct tcb *tcp)
 {
+       get_regs(tcp->pid);
+
        if (get_regs_error)
                return -1;