* Copyright (c) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Linux for s390 port by D.J. Barrow
* <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
- * Copyright (c) 1999-2017 The strace developers.
+ * Copyright (c) 1999-2018 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*/
#include "defs.h"
+#include "mmap_notify.h"
#include "native_defs.h"
+#include "ptrace.h"
#include "nsig.h"
#include "number_set.h"
-#include <sys/param.h>
+#include "delay.h"
+#include "retval.h"
+#include <limits.h>
/* for struct iovec */
#include <sys/uio.h>
#include <asm/unistd.h>
#include "regs.h"
-#include "ptrace.h"
#if defined(SPARC64)
# undef PTRACE_GETREGS
# define PTRACE_SETREGS PTRACE_SETREGS64
#endif
-#if defined SPARC64
-# include <asm/psrcompat.h>
-#elif defined SPARC
-# include <asm/psr.h>
-#endif
-
-#ifdef IA64
-# include <asm/rse.h>
-#endif
-
-#ifndef NT_PRSTATUS
-# define NT_PRSTATUS 1
-#endif
-
#include "syscall.h"
+#include "xstring.h"
/* Define these shorthand notations to simplify the syscallent files. */
#include "sysent_shorthand_defs.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] = {
#endif
};
+const char *const personality_names[] =
+# if defined X86_64
+ {"64 bit", "32 bit", "x32"}
+# elif defined X32
+ {"x32", "32 bit"}
+# elif SUPPORTED_PERSONALITIES == 2
+ {"64 bit", "32 bit"}
+# else
+ {STRINGIFY_VAL(__WORDSIZE) " bit"}
+# endif
+ ;
+
#if SUPPORTED_PERSONALITIES > 1
+
unsigned current_personality;
# ifndef current_wordsize
-unsigned current_wordsize;
+unsigned current_wordsize = PERSONALITY0_WORDSIZE;
static const int personality_wordsize[SUPPORTED_PERSONALITIES] = {
PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE,
# endif
# ifndef current_klongsize
-unsigned current_klongsize;
+unsigned current_klongsize = PERSONALITY0_KLONGSIZE;
static const int personality_klongsize[SUPPORTED_PERSONALITIES] = {
PERSONALITY0_KLONGSIZE,
PERSONALITY1_KLONGSIZE,
# endif
void
-set_personality(int personality)
+set_personality(unsigned int personality)
{
+ if (personality == current_personality)
+ return;
+
+ if (personality >= SUPPORTED_PERSONALITIES)
+ error_msg_and_die("Requested switch to unsupported personality "
+ "%u", personality);
+
nsyscalls = nsyscall_vec[personality];
sysent = sysent_vec[personality];
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
update_personality(struct tcb *tcp, unsigned int personality)
{
- if (personality == current_personality)
- return;
+ static bool need_mpers_warning[] =
+ { false, !HAVE_PERSONALITY_1_MPERS, !HAVE_PERSONALITY_2_MPERS };
+
set_personality(personality);
if (personality == tcp->currpers)
return;
tcp->currpers = personality;
-# undef PERSONALITY_NAMES
-# if defined X86_64
-# define PERSONALITY_NAMES {"64 bit", "32 bit", "x32"}
-# elif defined X32
-# define PERSONALITY_NAMES {"x32", "32 bit"}
-# elif SUPPORTED_PERSONALITIES == 2
-# define PERSONALITY_NAMES {"64 bit", "32 bit"}
-# endif
-# ifdef PERSONALITY_NAMES
if (!qflag) {
- static const char *const names[] = PERSONALITY_NAMES;
error_msg("[ Process PID=%d runs in %s mode. ]",
- tcp->pid, names[personality]);
+ tcp->pid, personality_names[personality]);
+ }
+
+ if (need_mpers_warning[personality]) {
+ error_msg("WARNING: Proper structure decoding for this "
+ "personality is not supported, please consider "
+ "building strace with mpers support enabled.");
+ need_mpers_warning[personality] = false;
}
-# endif
}
#endif
tcp->u_arg[i] = (sizeof(uint32_t) == current_wordsize)
? ((uint32_t *) (void *) buf)[i] : buf[i];
}
-#endif
+#endif /* SYS_socket_subcall */
#ifdef SYS_ipc_subcall
static void
for (i = 0; i < n; i++)
tcp->u_arg[i] = tcp->u_arg[i + 1];
}
-#endif
+#endif /* SYS_ipc_subcall */
-#ifdef LINUX_MIPSO32
+#ifdef SYS_syscall_subcall
static void
-decode_mips_subcall(struct tcb *tcp)
+decode_syscall_subcall(struct tcb *tcp)
{
if (!scno_is_valid(tcp->u_arg[0]))
return;
tcp->s_ent = &sysent[tcp->scno];
memmove(&tcp->u_arg[0], &tcp->u_arg[1],
sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
+# ifdef LINUX_MIPSO32
/*
* Fetching the last arg of 7-arg syscalls (fadvise64_64
* and sync_file_range) requires additional code,
&tcp->u_arg[MAX_ARGS - 1]) < 0)
tcp->u_arg[MAX_ARGS - 1] = 0;
}
+# endif /* LINUX_MIPSO32 */
}
-#endif /* LINUX_MIPSO32 */
+#endif /* SYS_syscall_subcall */
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;
}
}
-}
-/*
- * Shuffle syscall numbers so that we don't have huge gaps in syscall table.
- * The shuffling should be an involution: shuffle_scno(shuffle_scno(n)) == n.
- */
-static kernel_ulong_t
-shuffle_scno(kernel_ulong_t scno)
-{
-#ifdef ARM_FIRST_SHUFFLED_SYSCALL /* So far only 32-bit ARM needs this */
- if (scno < ARM_FIRST_SHUFFLED_SYSCALL)
- return scno;
-
- /* __ARM_NR_cmpxchg? Swap with LAST_ORDINARY+1 */
- if (scno == ARM_FIRST_SHUFFLED_SYSCALL)
- return 0x000ffff0;
- if (scno == 0x000ffff0)
- return ARM_FIRST_SHUFFLED_SYSCALL;
+ if (syserror(tcp))
+ return;
-# define ARM_SECOND_SHUFFLED_SYSCALL (ARM_FIRST_SHUFFLED_SYSCALL + 1)
- /*
- * Is it ARM specific syscall?
- * Swap [0x000f0000, 0x000f0000 + LAST_SPECIAL] range
- * with [SECOND_SHUFFLED, SECOND_SHUFFLED + LAST_SPECIAL] range.
- */
- if (scno >= 0x000f0000 &&
- scno <= 0x000f0000 + ARM_LAST_SPECIAL_SYSCALL) {
- return scno - 0x000f0000 + ARM_SECOND_SHUFFLED_SYSCALL;
- }
- if (scno <= ARM_SECOND_SHUFFLED_SYSCALL + ARM_LAST_SPECIAL_SYSCALL) {
- return scno + 0x000f0000 - ARM_SECOND_SHUFFLED_SYSCALL;
+ 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;
+ }
}
-#endif /* ARM_FIRST_SHUFFLED_SYSCALL */
-
- return scno;
}
const char *
return NULL;
}
-static long get_regs(pid_t pid);
+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 *);
static int arch_get_scno(struct tcb *tcp);
opts->first = opts->step;
- if (opts->data.flags & INJECT_F_SIGNAL)
- *signo = opts->data.signo;
- if (opts->data.flags & INJECT_F_RETVAL && !arch_set_scno(tcp, -1))
- tcp->flags |= TCB_TAMPERED;
+ if (!recovering(tcp)) {
+ if (opts->data.flags & INJECT_F_SIGNAL)
+ *signo = opts->data.signo;
+ 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;
}
tamper_with_syscall_exiting(struct tcb *tcp)
{
struct inject_opts *opts = tcb_inject_opts(tcp);
-
if (!opts)
return 0;
- if (opts->data.rval >= 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 ")",
+ tcp->pid, tcp->u_rval);
+
+ return 1;
+ }
+
+ bool update_tcb = false;
+
+ 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 {
+ update_tcb = true;
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;
tcp->u_error = new_error;
if (arch_set_error(tcp)) {
tcp->u_error = u_error;
+ } else {
+ update_tcb = true;
}
}
}
+ if (update_tcb) {
+ tcp->u_error = 0;
+ get_error(tcp, !(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS));
+ }
+
return 0;
}
return res;
}
-#ifdef LINUX_MIPSO32
- if (SEN_syscall == tcp->s_ent->sen)
- decode_mips_subcall(tcp);
-#endif
-
-#if defined(SYS_socket_subcall) || defined(SYS_ipc_subcall)
- switch (tcp->s_ent->sen) {
+#if defined SYS_ipc_subcall \
+ || defined SYS_socket_subcall \
+ || defined SYS_syscall_subcall
+ for (;;) {
+ switch (tcp->s_ent->sen) {
+# ifdef SYS_ipc_subcall
+ case SEN_ipc:
+ decode_ipc_subcall(tcp);
+ break;
+# endif
# ifdef SYS_socket_subcall
case SEN_socketcall:
decode_socket_subcall(tcp);
break;
# endif
-# ifdef SYS_ipc_subcall
- case SEN_ipc:
- decode_ipc_subcall(tcp);
+# ifdef SYS_syscall_subcall
+ case SEN_syscall:
+ decode_syscall_subcall(tcp);
+ if (tcp->s_ent->sen != SEN_syscall)
+ continue;
break;
# endif
+ }
+ break;
}
#endif
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);
-}
-
-static bool
-syscall_tampered(struct tcb *tcp)
-{
- return tcp->flags & TCB_TAMPERED;
+ 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);
-#ifdef USE_LIBUNWIND
- if (stack_trace_enabled) {
- if (tcp->s_ent->sys_flags & STACKTRACE_INVALIDATE_CACHE)
- unwind_cache_invalidate(tcp);
- }
-#endif
+ if (tcp->s_ent->sys_flags & MEMORY_MAPPING_CHANGE)
+ mmap_notify_report(tcp);
if (filtered(tcp) || hide_log(tcp))
return 0;
update_personality(tcp, tcp->currpers);
#endif
- return get_regs(tcp->pid) < 0 ? -1 : get_syscall_result(tcp);
+ return get_syscall_result(tcp);
}
int
-syscall_exiting_trace(struct tcb *tcp, struct timeval tv, int res)
+syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res)
{
- if (syserror(tcp) && 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;
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_error_str = err_name(u_error);
- if (u_error_str)
- tprintf("= -1 %s (%s)",
- u_error_str, strerror(u_error));
- else
- tprintf("= -1 %lu (%s)",
- u_error, strerror(u_error));
+ print_err_ret(tcp->u_rval, tcp->u_error);
break;
}
if (syscall_tampered(tcp))
switch (sys_res & RVAL_MASK) {
case RVAL_HEX:
#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
- if (current_wordsize < sizeof(tcp->u_rval)) {
+ if (current_klongsize < sizeof(tcp->u_rval)) {
tprintf("= %#x",
(unsigned int) tcp->u_rval);
} else
break;
case RVAL_UDECIMAL:
#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
- if (current_wordsize < sizeof(tcp->u_rval)) {
+ if (current_klongsize < sizeof(tcp->u_rval)) {
tprintf("= %u",
(unsigned int) tcp->u_rval);
} else
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"
-#ifdef HAVE_GETRVAL2
+#if HAVE_ARCH_GETRVAL2
# include "arch_getrval2.c"
#endif
#elif defined ARCH_PC_PEEK_ADDR
kernel_ulong_t pc;
# define ARCH_PC_REG pc
-# define ARCH_GET_PC upeek(tcp->pid, ARCH_PC_PEEK_ADDR, &pc)
+# define ARCH_GET_PC upeek(tcp, ARCH_PC_PEEK_ADDR, &pc)
#else
# error Neither ARCH_PC_REG nor ARCH_PC_PEEK_ADDR is defined
#endif
- if (get_regs(tcp->pid) < 0 || ARCH_GET_PC)
+ if (get_regs(tcp) < 0 || ARCH_GET_PC)
tprints(current_wordsize == 4 ? "[????????] "
: "[????????????????] ");
else
#endif
void
-clear_regs(void)
+clear_regs(struct tcb *tcp)
{
#ifdef ptrace_getregset_or_getregs
get_regs_error = -1;
}
static long
-get_regs(pid_t pid)
+get_regs(struct tcb *const tcp)
{
#ifdef ptrace_getregset_or_getregs
*/
static int use_getregs_old;
if (use_getregs_old < 0) {
- return get_regs_error = ptrace_getregset_or_getregs(pid);
+ return get_regs_error = ptrace_getregset_or_getregs(tcp->pid);
} else if (use_getregs_old == 0) {
- get_regs_error = ptrace_getregset_or_getregs(pid);
+ get_regs_error = ptrace_getregset_or_getregs(tcp->pid);
if (get_regs_error >= 0) {
use_getregs_old = -1;
return get_regs_error;
return get_regs_error;
use_getregs_old = 1;
}
- return get_regs_error = getregs_old(pid);
+ return get_regs_error = getregs_old(tcp);
# else /* !HAVE_GETREGS_OLD */
/* Assume that PTRACE_GETREGSET/PTRACE_GETREGS works. */
- return get_regs_error = ptrace_getregset_or_getregs(pid);
+ get_regs_error = ptrace_getregset_or_getregs(tcp->pid);
+
+# if defined ARCH_PERSONALITY_0_IOV_SIZE
+ if (get_regs_error)
+ return get_regs_error;
+
+ switch (ARCH_IOVEC_FOR_GETREGSET.iov_len) {
+ case ARCH_PERSONALITY_0_IOV_SIZE:
+ update_personality(tcp, 0);
+ break;
+ case ARCH_PERSONALITY_1_IOV_SIZE:
+ update_personality(tcp, 1);
+ break;
+ default: {
+ static bool printed = false;
+
+ if (!printed) {
+ error_msg("Unsupported regset size returned by "
+ "PTRACE_GETREGSET: %zu",
+ ARCH_IOVEC_FOR_GETREGSET.iov_len);
+
+ printed = true;
+ }
+
+ update_personality(tcp, 0);
+ }
+ }
+# endif /* ARCH_PERSONALITY_0_IOV_SIZE */
+
+ return get_regs_error;
+
# endif /* !HAVE_GETREGS_OLD */
#else /* !ptrace_getregset_or_getregs */
struct sysent_buf {
struct tcb *tcp;
struct_sysent ent;
- char buf[sizeof("syscall_%lu") + sizeof(kernel_ulong_t) * 3];
+ char buf[sizeof("syscall_0x") + sizeof(kernel_ulong_t) * 2];
};
static void
int
get_scno(struct tcb *tcp)
{
- if (get_regs(tcp->pid) < 0)
+ if (get_regs(tcp) < 0)
return -1;
int rc = arch_get_scno(tcp);
if (rc != 1)
return rc;
+ tcp->scno = shuffle_scno(tcp->scno);
+
if (scno_is_valid(tcp->scno)) {
tcp->s_ent = &sysent[tcp->scno];
tcp->qual_flg = qual_flags(tcp->scno);
s->ent.sen = SEN_printargs;
s->ent.sys_func = printargs;
s->ent.sys_name = s->buf;
- sprintf(s->buf, "syscall_%" PRI_klu, shuffle_scno(tcp->scno));
+ xsprintf(s->buf, "syscall_%#" PRI_klx, shuffle_scno(tcp->scno));
tcp->s_ent = &s->ent;
tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
set_tcb_priv_data(tcp, s, free_sysent_buf);
- debug_msg("pid %d invalid syscall %" PRI_kld,
- tcp->pid, tcp->scno);
+ debug_msg("pid %d invalid syscall %#" PRI_klx,
+ tcp->pid, shuffle_scno(tcp->scno));
}
+
+ /*
+ * We refrain from argument decoding during recovering
+ * as tracee memory mappings has changed and the registers
+ * are very likely pointing to garbage already.
+ */
+ if (recovering(tcp))
+ tcp->qual_flg |= QUAL_RAW;
+
return 1;
}
-#ifndef ptrace_getregset_or_getregs
+#ifdef ptrace_getregset_or_getregs
+# define get_syscall_result_regs get_regs
+#else
static int get_syscall_result_regs(struct tcb *);
#endif
static int
get_syscall_result(struct tcb *tcp)
{
-#ifndef ptrace_getregset_or_getregs
- if (get_syscall_result_regs(tcp))
+ if (get_syscall_result_regs(tcp) < 0)
return -1;
-#endif
tcp->u_error = 0;
- get_error(tcp, !(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS));
+ get_error(tcp,
+ !(tcp->s_ent->sys_flags & SYSCALL_NEVER_FAILS)
+ || syscall_tampered(tcp));
return 1;
}
#ifdef HAVE_GETREGS_OLD
# include "getregs_old.c"
#endif
+#include "shuffle_scno.c"
const char *
syscall_name(kernel_ulong_t scno)
{
-#if defined X32_PERSONALITY_NUMBER && defined __X32_SYSCALL_BIT
- if (current_personality == X32_PERSONALITY_NUMBER)
- scno &= ~__X32_SYSCALL_BIT;
-#endif
return scno_is_valid(scno) ? sysent[scno].sys_name : NULL;
}
projects / strace / blobdiff