*/
#include "defs.h"
+#include "mmap_notify.h"
#include "native_defs.h"
#include "ptrace.h"
#include "nsig.h"
#include "number_set.h"
+#include "delay.h"
+#include "retval.h"
#include <limits.h>
/* for struct iovec */
# define PTRACE_SETREGS PTRACE_SETREGS64
#endif
-#ifndef NT_PRSTATUS
-# define NT_PRSTATUS 1
-#endif
-
#include "syscall.h"
#include "xstring.h"
/* Now undef them since short defines cause wicked namespace pollution. */
#include "sysent_shorthand_undefs.h"
+const char *const errnoent[] = {
+#include "errnoent.h"
+};
+const char *const signalent[] = {
+#include "signalent.h"
+
+};
/*
* `ioctlent[012].h' files are automatically generated by the auxiliary
* program `ioctlsort', such that the list is sorted by the `code' field.
* in "/usr/include".
*/
-const char *const errnoent0[] = {
-#include "errnoent.h"
-};
-const char *const signalent0[] = {
-#include "signalent.h"
-};
const struct_ioctlent ioctlent0[] = {
#include "ioctlent0.h"
};
#if SUPPORTED_PERSONALITIES > 1
-static const char *const errnoent1[] = {
-# include "errnoent1.h"
-};
-static const char *const signalent1[] = {
-# include "signalent1.h"
-};
static const struct_ioctlent ioctlent1[] = {
# include "ioctlent1.h"
};
#endif
#if SUPPORTED_PERSONALITIES > 2
-static const char *const errnoent2[] = {
-# include "errnoent2.h"
-};
-static const char *const signalent2[] = {
-# include "signalent2.h"
-};
static const struct_ioctlent ioctlent2[] = {
# include "ioctlent2.h"
};
#endif
};
-enum {
- nerrnos0 = ARRAY_SIZE(errnoent0)
-#if SUPPORTED_PERSONALITIES > 1
- , nerrnos1 = ARRAY_SIZE(errnoent1)
-# if SUPPORTED_PERSONALITIES > 2
- , nerrnos2 = ARRAY_SIZE(errnoent2)
-# endif
-#endif
-};
-
-enum {
- nsignals0 = ARRAY_SIZE(signalent0)
-#if SUPPORTED_PERSONALITIES > 1
- , nsignals1 = ARRAY_SIZE(signalent1)
-# if SUPPORTED_PERSONALITIES > 2
- , nsignals2 = ARRAY_SIZE(signalent2)
-# endif
-#endif
-};
-
enum {
nioctlents0 = ARRAY_SIZE(ioctlent0)
#if SUPPORTED_PERSONALITIES > 1
#if SUPPORTED_PERSONALITIES > 1
const struct_sysent *sysent = sysent0;
-const char *const *errnoent = errnoent0;
-const char *const *signalent = signalent0;
const struct_ioctlent *ioctlent = ioctlent0;
const struct_printers *printers = &printers0;
#endif
+const unsigned int nerrnos = ARRAY_SIZE(errnoent);
+const unsigned int nsignals = ARRAY_SIZE(signalent);
unsigned nsyscalls = nsyscalls0;
-unsigned nerrnos = nerrnos0;
-unsigned nsignals = nsignals0;
unsigned nioctlents = nioctlents0;
const unsigned int nsyscall_vec[SUPPORTED_PERSONALITIES] = {
switch (personality) {
case 0:
- errnoent = errnoent0;
- nerrnos = nerrnos0;
ioctlent = ioctlent0;
nioctlents = nioctlents0;
- signalent = signalent0;
- nsignals = nsignals0;
printers = &printers0;
break;
case 1:
- errnoent = errnoent1;
- nerrnos = nerrnos1;
ioctlent = ioctlent1;
nioctlents = nioctlents1;
- signalent = signalent1;
- nsignals = nsignals1;
printers = &printers1;
break;
# if SUPPORTED_PERSONALITIES > 2
case 2:
- errnoent = errnoent2;
- nerrnos = nerrnos2;
ioctlent = ioctlent2;
nioctlents = nioctlents2;
- signalent = signalent2;
- nsignals = nsignals2;
printers = &printers2;
break;
# endif
static void
dumpio(struct tcb *tcp)
{
- if (syserror(tcp))
- return;
-
int fd = tcp->u_arg[0];
if (fd < 0)
return;
- if (is_number_in_set(fd, read_set)) {
- switch (tcp->s_ent->sen) {
- case SEN_read:
- case SEN_pread:
- case SEN_recv:
- case SEN_recvfrom:
- case SEN_mq_timedreceive:
- dumpstr(tcp, tcp->u_arg[1], tcp->u_rval);
- return;
- case SEN_readv:
- case SEN_preadv:
- case SEN_preadv2:
- dumpiov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
- tcp->u_rval);
- return;
- case SEN_recvmsg:
- dumpiov_in_msghdr(tcp, tcp->u_arg[1], tcp->u_rval);
- return;
- case SEN_recvmmsg:
- dumpiov_in_mmsghdr(tcp, tcp->u_arg[1]);
- return;
- }
- }
if (is_number_in_set(fd, write_set)) {
switch (tcp->s_ent->sen) {
case SEN_write:
break;
}
}
+
+ if (syserror(tcp))
+ return;
+
+ if (is_number_in_set(fd, read_set)) {
+ switch (tcp->s_ent->sen) {
+ case SEN_read:
+ case SEN_pread:
+ case SEN_recv:
+ case SEN_recvfrom:
+ case SEN_mq_timedreceive:
+ dumpstr(tcp, tcp->u_arg[1], tcp->u_rval);
+ return;
+ case SEN_readv:
+ case SEN_preadv:
+ case SEN_preadv2:
+ dumpiov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
+ tcp->u_rval);
+ return;
+ case SEN_recvmsg:
+ dumpiov_in_msghdr(tcp, tcp->u_arg[1], tcp->u_rval);
+ return;
+ case SEN_recvmmsg:
+ dumpiov_in_mmsghdr(tcp, tcp->u_arg[1]);
+ return;
+ }
+ }
}
const char *
return NULL;
}
+static void
+print_err_ret(kernel_ulong_t ret, unsigned long u_error)
+{
+ const char *u_error_str = err_name(u_error);
+
+ if (u_error_str)
+ tprintf("= %" PRI_kld " %s (%s)",
+ ret, u_error_str, strerror(u_error));
+ else
+ tprintf("= %" PRI_kld " (errno %lu)", ret, u_error);
+}
+
static long get_regs(struct tcb *);
static int get_syscall_args(struct tcb *);
static int get_syscall_result(struct tcb *);
if (!recovering(tcp)) {
if (opts->data.flags & INJECT_F_SIGNAL)
*signo = opts->data.signo;
- if (opts->data.flags & INJECT_F_RETVAL &&
+ if (opts->data.flags & (INJECT_F_ERROR | INJECT_F_RETVAL) &&
!arch_set_scno(tcp, -1))
tcp->flags |= TCB_TAMPERED;
+ if (opts->data.flags & INJECT_F_DELAY_ENTER)
+ delay_tcb(tcp, opts->data.delay_idx, true);
+ if (opts->data.flags & INJECT_F_DELAY_EXIT)
+ tcp->flags |= TCB_INJECT_DELAY_EXIT;
}
return 0;
static long
tamper_with_syscall_exiting(struct tcb *tcp)
{
+ struct inject_opts *opts = tcb_inject_opts(tcp);
+ if (!opts)
+ return 0;
+
+ if (inject_delay_exit(tcp))
+ delay_tcb(tcp, opts->data.delay_idx, false);
+
+ if (!syscall_tampered(tcp))
+ return 0;
+
if (!syserror(tcp)) {
error_msg("Failed to tamper with process %d: got no error "
"(return value %#" PRI_klx ")",
return 1;
}
- struct inject_opts *opts = tcb_inject_opts(tcp);
bool update_tcb = false;
- if (!opts)
- return 0;
-
- if (opts->data.rval >= 0) {
+ if (opts->data.flags & INJECT_F_RETVAL) {
+ kernel_long_t inject_rval =
+ retval_get(opts->data.rval_idx);
kernel_long_t u_rval = tcp->u_rval;
- tcp->u_rval = opts->data.rval;
+ tcp->u_rval = inject_rval;
if (arch_set_success(tcp)) {
tcp->u_rval = u_rval;
} else {
tcp->u_error = 0;
}
} else {
- unsigned long new_error = -opts->data.rval;
+ unsigned long new_error = retval_get(opts->data.rval_idx);
if (new_error != tcp->u_error && new_error <= MAX_ERRNO_VALUE) {
unsigned long u_error = tcp->u_error;
return 0;
}
-#ifdef USE_LIBUNWIND
+#ifdef ENABLE_STACKTRACE
if (stack_trace_enabled) {
if (tcp->s_ent->sys_flags & STACKTRACE_CAPTURE_ON_ENTER)
- unwind_capture_stacktrace(tcp);
+ unwind_tcb_capture(tcp);
}
#endif
tcp->sys_func_rval = res;
/* Measure the entrance time as late as possible to avoid errors. */
if ((Tflag || cflag) && !filtered(tcp))
- gettimeofday(&tcp->etime, NULL);
+ clock_gettime(CLOCK_MONOTONIC, &tcp->etime);
}
/* Returns:
* value. Anyway, call syscall_exiting_finish(tcp) then.
*/
int
-syscall_exiting_decode(struct tcb *tcp, struct timeval *ptv)
+syscall_exiting_decode(struct tcb *tcp, struct timespec *pts)
{
/* Measure the exit time as early as possible to avoid errors. */
if ((Tflag || cflag) && !(filtered(tcp) || hide_log(tcp)))
- gettimeofday(ptv, NULL);
+ clock_gettime(CLOCK_MONOTONIC, pts);
- if (mmap_cache_is_enabled()) {
- if (tcp->s_ent->sys_flags & STACKTRACE_INVALIDATE_CACHE)
- mmap_cache_invalidate(tcp);
- }
+ if (tcp->s_ent->sys_flags & MEMORY_MAPPING_CHANGE)
+ mmap_notify_report(tcp);
if (filtered(tcp) || hide_log(tcp))
return 0;
}
int
-syscall_exiting_trace(struct tcb *tcp, struct timeval tv, int res)
+syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res)
{
- if (syscall_tampered(tcp))
+ if (syscall_tampered(tcp) || inject_delay_exit(tcp))
tamper_with_syscall_exiting(tcp);
if (cflag) {
- count_syscall(tcp, &tv);
+ count_syscall(tcp, ts);
if (cflag == CFLAG_ONLY_STATS) {
return 0;
}
tprints(") ");
tabto();
- unsigned long u_error = tcp->u_error;
- kernel_long_t u_rval;
if (raw(tcp)) {
- if (u_error) {
- tprintf("= -1 (errno %lu)", u_error);
- } else {
+ if (tcp->u_error)
+ print_err_ret(tcp->u_rval, tcp->u_error);
+ else
tprintf("= %#" PRI_klx, tcp->u_rval);
- }
+
if (syscall_tampered(tcp))
tprints(" (INJECTED)");
- } else if (!(sys_res & RVAL_NONE) && u_error) {
- const char *u_error_str;
-
- switch (u_error) {
+ } else if (!(sys_res & RVAL_NONE) && tcp->u_error) {
+ switch (tcp->u_error) {
/* Blocked signals do not interrupt any syscalls.
* In this case syscalls don't return ERESTARTfoo codes.
*
tprints("= ? ERESTART_RESTARTBLOCK (Interrupted by signal)");
break;
default:
- u_rval = sys_res & RVAL_PRINT_ERR_VAL ?
- tcp->u_rval : -1;
- u_error_str = err_name(u_error);
- if (u_error_str)
- tprintf("= %" PRI_kld " %s (%s)",
- u_rval, u_error_str, strerror(u_error));
- else
- tprintf("= %" PRI_kld " %lu (%s)",
- u_rval, u_error, strerror(u_error));
+ print_err_ret(tcp->u_rval, tcp->u_error);
break;
}
if (syscall_tampered(tcp))
tprintf("= %" PRI_klu, tcp->u_rval);
}
break;
- case RVAL_DECIMAL:
- tprintf("= %" PRI_kld, tcp->u_rval);
- break;
case RVAL_FD:
if (show_fd_path) {
tprints("= ");
tprints(" (INJECTED)");
}
if (Tflag) {
- tv_sub(&tv, &tv, &tcp->etime);
+ ts_sub(ts, ts, &tcp->etime);
tprintf(" <%ld.%06ld>",
- (long) tv.tv_sec, (long) tv.tv_usec);
+ (long) ts->tv_sec, (long) ts->tv_nsec / 1000);
}
tprints("\n");
dumpio(tcp);
line_ended();
-#ifdef USE_LIBUNWIND
+#ifdef ENABLE_STACKTRACE
if (stack_trace_enabled)
- unwind_print_stacktrace(tcp);
+ unwind_tcb_print(tcp);
#endif
return 0;
}
void
syscall_exiting_finish(struct tcb *tcp)
{
- tcp->flags &= ~(TCB_INSYSCALL | TCB_TAMPERED);
+ tcp->flags &= ~(TCB_INSYSCALL | TCB_TAMPERED | TCB_INJECT_DELAY_EXIT);
tcp->sys_func_rval = 0;
free_tcb_priv_data(tcp);
}
tcp->u_error = saved_u_error;
}
+#define XLAT_MACROS_ONLY
+# include "xlat/nt_descriptor_types.h"
+#undef XLAT_MACROS_ONLY
+
#include "arch_regs.c"
#if HAVE_ARCH_GETRVAL2
projects / strace / blobdiff