* 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) 2001-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*/
#include "defs.h"
-#include <fcntl.h>
-
-#include "regs.h"
-#include "ptrace.h"
-
-#if defined(SPARC) || defined(SPARC64) || defined(MIPS)
-typedef struct {
- struct pt_regs si_regs;
- int si_mask;
-} m_siginfo_t;
-#elif defined HAVE_ASM_SIGCONTEXT_H
-# if !defined(IA64) && !defined(X86_64) && !defined(X32)
-# include <asm/sigcontext.h>
-# endif
-#else /* !HAVE_ASM_SIGCONTEXT_H */
-# if defined M68K && !defined HAVE_STRUCT_SIGCONTEXT
-struct sigcontext {
- unsigned long sc_mask;
- unsigned long sc_usp;
- unsigned long sc_d0;
- unsigned long sc_d1;
- unsigned long sc_a0;
- unsigned long sc_a1;
- unsigned short sc_sr;
- unsigned long sc_pc;
- unsigned short sc_formatvec;
-};
-# endif /* M68K */
-#endif /* !HAVE_ASM_SIGCONTEXT_H */
-
-#ifndef NSIG
-# warning: NSIG is not defined, using 32
-# define NSIG 32
-#elif NSIG < 32
-# error: NSIG < 32
-#endif
+#include "nsig.h"
/* The libc headers do not define this constant since it should only be
used by the implementation. So we define it here. */
# define HAVE_SA_RESTORER 1
# endif
#else /* !SA_RESTORER */
-# if defined SPARC || defined SPARC64
+# if defined SPARC || defined SPARC64 || defined M68K
# define HAVE_SA_RESTORER 1
# else
# define HAVE_SA_RESTORER 0
# endif
#endif
+#include "xlat/sa_handler_values.h"
#include "xlat/sigact_flags.h"
#include "xlat/sigprocmaskcmds.h"
/* Anonymous realtime signals. */
-/* Under glibc 2.1, SIGRTMIN et al are functions, but __SIGRTMIN is a
- constant. This is what we want. Otherwise, just use SIGRTMIN. */
-#ifdef SIGRTMIN
-#ifndef __SIGRTMIN
-#define __SIGRTMIN SIGRTMIN
-#define __SIGRTMAX SIGRTMAX /* likewise */
-#endif
+#ifndef ASM_SIGRTMIN
+/* Linux kernel >= 3.18 defines SIGRTMIN to 32 on all architectures. */
+# define ASM_SIGRTMIN 32
+#endif
+#ifndef ASM_SIGRTMAX
+/* Under glibc 2.1, SIGRTMAX et al are functions, but __SIGRTMAX is a
+ constant. This is what we want. Otherwise, just use SIGRTMAX. */
+# ifdef SIGRTMAX
+# ifndef __SIGRTMAX
+# define __SIGRTMAX SIGRTMAX
+# endif
+# endif
+# ifdef __SIGRTMAX
+# define ASM_SIGRTMAX __SIGRTMAX
+# endif
#endif
/* Note on the size of sigset_t:
* umoven(tcp, addr, sizeof(sigset_t), &sigset)
* may be a bad idea: it'll try to read much more data than needed
* to fetch a sigset_t.
- * Use (NSIG / 8) as a size instead.
+ * Use NSIG_BYTES as a size instead.
*/
+static const char *
+get_sa_handler_str(kernel_ulong_t handler)
+{
+ return xlookup(sa_handler_values, handler);
+}
+
+static void
+print_sa_handler(kernel_ulong_t handler)
+{
+ const char *sa_handler_str = get_sa_handler_str(handler);
+
+ if (sa_handler_str)
+ tprints(sa_handler_str);
+ else
+ printaddr(handler);
+}
+
const char *
signame(const int sig)
{
if (s < nsignals)
return signalent[s];
-#ifdef SIGRTMIN
- if (s >= __SIGRTMIN && s <= __SIGRTMAX) {
- sprintf(buf, "SIGRT_%u", s - __SIGRTMIN);
+#ifdef ASM_SIGRTMAX
+ if (s >= ASM_SIGRTMIN && s <= (unsigned int) ASM_SIGRTMAX) {
+ sprintf(buf, "SIGRT_%u", s - ASM_SIGRTMIN);
return buf;
}
#endif
return count;
}
-static const char *
+const char *
sprintsigmask_n(const char *prefix, const void *sig_mask, unsigned int bytes)
{
/*
- * The maximum number of signal names to be printed is NSIG * 2 / 3.
+ * The maximum number of signal names to be printed
+ * is NSIG_BYTES * 8 * 2 / 3.
* Most of signal names have length 7,
* average length of signal names is less than 7.
* The length of prefix string does not exceed 16.
*/
- static char outstr[128 + 8 * (NSIG * 2 / 3)];
+ static char outstr[128 + 8 * (NSIG_BYTES * 8 * 2 / 3)];
char *s;
const uint32_t *mask;
- uint32_t inverted_mask[NSIG / 32];
+ uint32_t inverted_mask[NSIG_BYTES / 4];
unsigned int size;
int i;
char sep;
mask = sig_mask;
/* length of signal mask in 4-byte words */
- size = (bytes >= NSIG / 8) ? NSIG / 32 : (bytes + 3) / 4;
+ size = (bytes >= NSIG_BYTES) ? NSIG_BYTES / 4 : (bytes + 3) / 4;
/* check whether 2/3 or more bits are set */
- if (popcount32(mask, size) >= size * 32 * 2 / 3) {
+ if (popcount32(mask, size) >= size * (4 * 8) * 2 / 3) {
/* show those signals that are NOT in the mask */
unsigned int j;
for (j = 0; j < size; ++j)
}
sep = '[';
- for (i = 0; (i = next_set_bit(mask, i, size * 32)) >= 0; ) {
+ for (i = 0; (i = next_set_bit(mask, i, size * (4 * 8))) >= 0; ) {
++i;
*s++ = sep;
if ((unsigned) i < nsignals) {
s = stpcpy(s, signalent[i] + 3);
}
-#ifdef SIGRTMIN
- else if (i >= __SIGRTMIN && i <= __SIGRTMAX) {
- s += sprintf(s, "RT_%u", i - __SIGRTMIN);
+#ifdef ASM_SIGRTMAX
+ else if (i >= ASM_SIGRTMIN && i <= ASM_SIGRTMAX) {
+ s += sprintf(s, "RT_%u", i - ASM_SIGRTMIN);
}
#endif
else {
return outstr;
}
-#define tprintsigmask_addr(prefix, mask) \
- tprints(sprintsigmask_n((prefix), (mask), sizeof(mask)))
-
#define sprintsigmask_val(prefix, mask) \
sprintsigmask_n((prefix), &(mask), sizeof(mask))
#define tprintsigmask_val(prefix, mask) \
tprints(sprintsigmask_n((prefix), &(mask), sizeof(mask)))
+static const char *
+sprint_old_sigmask_val(const char *const prefix, const unsigned long mask)
+{
+#if defined(current_wordsize) || !defined(WORDS_BIGENDIAN)
+ return sprintsigmask_n(prefix, &mask, current_wordsize);
+#else /* !current_wordsize && WORDS_BIGENDIAN */
+ if (current_wordsize == sizeof(mask)) {
+ return sprintsigmask_val(prefix, mask);
+ } else {
+ uint32_t mask32 = mask;
+ return sprintsigmask_val(prefix, mask32);
+ }
+#endif
+}
+
+#define tprint_old_sigmask_val(prefix, mask) \
+ tprints(sprint_old_sigmask_val((prefix), (mask)))
+
void
printsignal(int nr)
{
tprints(signame(nr));
}
-void
-print_sigset_addr_len(struct tcb *tcp, long addr, long len)
+static void
+print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
+ const kernel_ulong_t len, const unsigned int min_len)
{
- char mask[NSIG / 8];
-
- if (!addr) {
- tprints("NULL");
- return;
- }
- /* Here len is usually equals NSIG / 8 or current_wordsize.
+ /*
+ * Here len is usually equal to NSIG_BYTES or current_wordsize.
* But we code this defensively:
*/
- if (len < 0) {
- bad:
- tprintf("%#lx", addr);
+ if (len < min_len || len > NSIG_BYTES) {
+ printaddr(addr);
return;
}
- if (len >= NSIG / 8)
- len = NSIG / 8;
- else
- len = (len + 3) & ~3;
-
- if (umoven(tcp, addr, len, mask) < 0)
- goto bad;
+ int mask[NSIG_BYTES / sizeof(int)] = {};
+ if (umoven_or_printaddr(tcp, addr, len, mask))
+ return;
tprints(sprintsigmask_n("", mask, len));
}
-#ifndef ILL_ILLOPC
-#define ILL_ILLOPC 1 /* illegal opcode */
-#define ILL_ILLOPN 2 /* illegal operand */
-#define ILL_ILLADR 3 /* illegal addressing mode */
-#define ILL_ILLTRP 4 /* illegal trap */
-#define ILL_PRVOPC 5 /* privileged opcode */
-#define ILL_PRVREG 6 /* privileged register */
-#define ILL_COPROC 7 /* coprocessor error */
-#define ILL_BADSTK 8 /* internal stack error */
-#define FPE_INTDIV 1 /* integer divide by zero */
-#define FPE_INTOVF 2 /* integer overflow */
-#define FPE_FLTDIV 3 /* floating point divide by zero */
-#define FPE_FLTOVF 4 /* floating point overflow */
-#define FPE_FLTUND 5 /* floating point underflow */
-#define FPE_FLTRES 6 /* floating point inexact result */
-#define FPE_FLTINV 7 /* floating point invalid operation */
-#define FPE_FLTSUB 8 /* subscript out of range */
-#define SEGV_MAPERR 1 /* address not mapped to object */
-#define SEGV_ACCERR 2 /* invalid permissions for mapped object */
-#define BUS_ADRALN 1 /* invalid address alignment */
-#define BUS_ADRERR 2 /* non-existant physical address */
-#define BUS_OBJERR 3 /* object specific hardware error */
-#define SYS_SECCOMP 1 /* seccomp triggered */
-#define TRAP_BRKPT 1 /* process breakpoint */
-#define TRAP_TRACE 2 /* process trace trap */
-#define CLD_EXITED 1 /* child has exited */
-#define CLD_KILLED 2 /* child was killed */
-#define CLD_DUMPED 3 /* child terminated abnormally */
-#define CLD_TRAPPED 4 /* traced child has trapped */
-#define CLD_STOPPED 5 /* child has stopped */
-#define CLD_CONTINUED 6 /* stopped child has continued */
-#define POLL_IN 1 /* data input available */
-#define POLL_OUT 2 /* output buffers available */
-#define POLL_MSG 3 /* input message available */
-#define POLL_ERR 4 /* i/o error */
-#define POLL_PRI 5 /* high priority input available */
-#define POLL_HUP 6 /* device disconnected */
-#define SI_KERNEL 0x80 /* sent by kernel */
-#define SI_USER 0 /* sent by kill, sigsend, raise */
-#define SI_QUEUE -1 /* sent by sigqueue */
-#define SI_TIMER -2 /* sent by timer expiration */
-#define SI_MESGQ -3 /* sent by real time mesq state change */
-#define SI_ASYNCIO -4 /* sent by AIO completion */
-#define SI_SIGIO -5 /* sent by SIGIO */
-#define SI_TKILL -6 /* sent by tkill */
-#define SI_DETHREAD -7 /* sent by execve killing subsidiary threads */
-#define SI_ASYNCNL -60 /* sent by asynch name lookup completion */
-#endif
-
-#ifndef SI_FROMUSER
-# define SI_FROMUSER(sip) ((sip)->si_code <= 0)
-#endif
-
-#include "xlat/siginfo_codes.h"
-#include "xlat/sigill_codes.h"
-#include "xlat/sigfpe_codes.h"
-#include "xlat/sigtrap_codes.h"
-#include "xlat/sigchld_codes.h"
-#include "xlat/sigpoll_codes.h"
-#include "xlat/sigprof_codes.h"
-
-#ifdef SIGEMT
-#include "xlat/sigemt_codes.h"
-#endif
-
-#include "xlat/sigsegv_codes.h"
-#include "xlat/sigbus_codes.h"
-
-#ifndef SYS_SECCOMP
-# define SYS_SECCOMP 1
-#endif
-#include "xlat/sigsys_codes.h"
-
-static void
-printsigsource(const siginfo_t *sip)
-{
- tprintf(", si_pid=%lu, si_uid=%lu",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
-}
-
-static void
-printsigval(const siginfo_t *sip, int verbose)
-{
- if (!verbose)
- tprints(", ...");
- else
- tprintf(", si_value={int=%u, ptr=%#lx}",
- sip->si_int,
- (unsigned long) sip->si_ptr);
-}
-
void
-printsiginfo(const siginfo_t *sip, int verbose)
+print_sigset_addr_len(struct tcb *const tcp, const kernel_ulong_t addr,
+ const kernel_ulong_t len)
{
- const char *code;
-
- if (sip->si_signo == 0) {
- tprints("{}");
- return;
- }
- tprints("{si_signo=");
- printsignal(sip->si_signo);
- code = xlookup(siginfo_codes, sip->si_code);
- if (!code) {
- switch (sip->si_signo) {
- case SIGTRAP:
- code = xlookup(sigtrap_codes, sip->si_code);
- break;
- case SIGCHLD:
- code = xlookup(sigchld_codes, sip->si_code);
- break;
- case SIGPOLL:
- code = xlookup(sigpoll_codes, sip->si_code);
- break;
- case SIGPROF:
- code = xlookup(sigprof_codes, sip->si_code);
- break;
- case SIGILL:
- code = xlookup(sigill_codes, sip->si_code);
- break;
-#ifdef SIGEMT
- case SIGEMT:
- code = xlookup(sigemt_codes, sip->si_code);
- break;
-#endif
- case SIGFPE:
- code = xlookup(sigfpe_codes, sip->si_code);
- break;
- case SIGSEGV:
- code = xlookup(sigsegv_codes, sip->si_code);
- break;
- case SIGBUS:
- code = xlookup(sigbus_codes, sip->si_code);
- break;
- case SIGSYS:
- code = xlookup(sigsys_codes, sip->si_code);
- break;
- }
- }
- if (code)
- tprintf(", si_code=%s", code);
- else
- tprintf(", si_code=%#x", sip->si_code);
-#ifdef SI_NOINFO
- if (sip->si_code != SI_NOINFO)
-#endif
- {
- if (sip->si_errno) {
- tprints(", si_errno=");
- if ((unsigned) sip->si_errno < nerrnos
- && errnoent[sip->si_errno])
- tprints(errnoent[sip->si_errno]);
- else
- tprintf("%d", sip->si_errno);
- }
-#ifdef SI_FROMUSER
- if (SI_FROMUSER(sip)) {
- switch (sip->si_code) {
-#ifdef SI_USER
- case SI_USER:
- printsigsource(sip);
- break;
-#endif
-#ifdef SI_TKILL
- case SI_TKILL:
- printsigsource(sip);
- break;
-#endif
-#if defined SI_TIMER \
- && defined HAVE_SIGINFO_T_SI_TIMERID && defined HAVE_SIGINFO_T_SI_OVERRUN
- case SI_TIMER:
- tprintf(", si_timerid=%#x, si_overrun=%d",
- sip->si_timerid, sip->si_overrun);
- printsigval(sip, verbose);
- break;
-#endif
- default:
- printsigsource(sip);
- if (sip->si_ptr)
- printsigval(sip, verbose);
- break;
- }
- }
- else
-#endif /* SI_FROMUSER */
- {
- switch (sip->si_signo) {
- case SIGCHLD:
- printsigsource(sip);
- tprints(", si_status=");
- if (sip->si_code == CLD_EXITED)
- tprintf("%d", sip->si_status);
- else
- printsignal(sip->si_status);
- if (!verbose)
- tprints(", ...");
- else
- tprintf(", si_utime=%llu, si_stime=%llu",
- (unsigned long long) sip->si_utime,
- (unsigned long long) sip->si_stime);
- break;
- case SIGILL: case SIGFPE:
- case SIGSEGV: case SIGBUS:
- tprintf(", si_addr=%#lx",
- (unsigned long) sip->si_addr);
- break;
- case SIGPOLL:
- switch (sip->si_code) {
- case POLL_IN: case POLL_OUT: case POLL_MSG:
- tprintf(", si_band=%ld",
- (long) sip->si_band);
- break;
- }
- break;
-#ifdef HAVE_SIGINFO_T_SI_SYSCALL
- case SIGSYS:
- tprintf(", si_call_addr=%#lx, si_syscall=%d, si_arch=%u",
- (unsigned long) sip->si_call_addr,
- sip->si_syscall, sip->si_arch);
- break;
-#endif
- default:
- if (sip->si_pid || sip->si_uid)
- printsigsource(sip);
- if (sip->si_ptr)
- printsigval(sip, verbose);
- }
- }
- }
- tprints("}");
+ print_sigset_addr_len_limit(tcp, addr, len, current_wordsize);
}
void
-printsiginfo_at(struct tcb *tcp, long addr)
+print_sigset_addr(struct tcb *const tcp, const kernel_ulong_t addr)
{
- siginfo_t si;
- if (!addr) {
- tprints("NULL");
- return;
- }
- if (syserror(tcp)) {
- tprintf("%#lx", addr);
- return;
- }
- if (umove(tcp, addr, &si) < 0) {
- tprints("{???}");
- return;
- }
- printsiginfo(&si, verbose(tcp));
+ print_sigset_addr_len_limit(tcp, addr, NSIG_BYTES, NSIG_BYTES);
}
-int
-sys_sigsetmask(struct tcb *tcp)
+SYS_FUNC(ssetmask)
{
if (entering(tcp)) {
- tprintsigmask_val("", tcp->u_arg[0]);
+ tprint_old_sigmask_val("", (unsigned) tcp->u_arg[0]);
}
else if (!syserror(tcp)) {
- tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
+ tcp->auxstr = sprint_old_sigmask_val("old mask ",
+ (unsigned) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
return 0;
}
-#ifdef HAVE_SIGACTION
-
struct old_sigaction {
/* sa_handler may be a libc #define, need to use other name: */
-#ifdef MIPS
+#if defined MIPS
+ unsigned int sa_flags;
+ unsigned long sa_handler__;
+ unsigned long sa_mask;
+#elif defined ALPHA
+ unsigned long sa_handler__;
+ unsigned long sa_mask;
unsigned int sa_flags;
- void (*__sa_handler)(int);
- /* Kernel treats sa_mask as an array of longs. */
- unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
#else
- void (*__sa_handler)(int);
+ unsigned long sa_handler__;
unsigned long sa_mask;
unsigned long sa_flags;
-#endif /* !MIPS */
-#if HAVE_SA_RESTORER
- void (*sa_restorer)(void);
+ unsigned long sa_restorer;
#endif
-};
-
-struct old_sigaction32 {
- /* sa_handler may be a libc #define, need to use other name: */
- uint32_t __sa_handler;
- uint32_t sa_mask;
- uint32_t sa_flags;
-#if HAVE_SA_RESTORER
- uint32_t sa_restorer;
+}
+#ifdef ALPHA
+ ATTRIBUTE_PACKED
#endif
-};
+;
static void
-decode_old_sigaction(struct tcb *tcp, long addr)
+decode_old_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct old_sigaction sa;
- int r;
- if (!addr) {
- tprints("NULL");
- return;
- }
- if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
- tprintf("%#lx", addr);
- return;
- }
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize != sizeof(sa.__sa_handler) && current_wordsize == 4) {
- struct old_sigaction32 sa32;
- r = umove(tcp, addr, &sa32);
- if (r >= 0) {
- memset(&sa, 0, sizeof(sa));
- sa.__sa_handler = (void*)(uintptr_t)sa32.__sa_handler;
- sa.sa_flags = sa32.sa_flags;
-#if HAVE_SA_RESTORER && defined SA_RESTORER
- sa.sa_restorer = (void*)(uintptr_t)sa32.sa_restorer;
-#endif
- sa.sa_mask = sa32.sa_mask;
- }
+#ifndef current_wordsize
+ if (current_wordsize < sizeof(sa.sa_handler__)) {
+ struct old_sigaction32 {
+ uint32_t sa_handler__;
+ uint32_t sa_mask;
+ uint32_t sa_flags;
+ uint32_t sa_restorer;
+ } sa32;
+
+ if (umove_or_printaddr(tcp, addr, &sa32))
+ return;
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_handler__ = sa32.sa_handler__;
+ sa.sa_flags = sa32.sa_flags;
+ sa.sa_restorer = sa32.sa_restorer;
+ sa.sa_mask = sa32.sa_mask;
} else
#endif
- {
- r = umove(tcp, addr, &sa);
- }
- if (r < 0) {
- tprints("{...}");
+ if (umove_or_printaddr(tcp, addr, &sa))
return;
- }
- /* Architectures using function pointers, like
- * hppa, may need to manipulate the function pointer
- * to compute the result of a comparison. However,
- * the __sa_handler function pointer exists only in
- * the address space of the traced process, and can't
- * be manipulated by strace. In order to prevent the
- * compiler from generating code to manipulate
- * __sa_handler we cast the function pointers to long. */
- if ((long)sa.__sa_handler == (long)SIG_ERR)
- tprints("{SIG_ERR, ");
- else if ((long)sa.__sa_handler == (long)SIG_DFL)
- tprints("{SIG_DFL, ");
- else if ((long)sa.__sa_handler == (long)SIG_IGN)
- tprints("{SIG_IGN, ");
- else
- tprintf("{%#lx, ", (long) sa.__sa_handler);
-#ifdef MIPS
- tprintsigmask_addr("", sa.sa_mask);
-#else
- tprintsigmask_val("", sa.sa_mask);
-#endif
- tprints(", ");
+ tprints("{sa_handler=");
+ print_sa_handler(sa.sa_handler__);
+ tprints(", sa_mask=");
+ tprint_old_sigmask_val("", sa.sa_mask);
+ tprints(", sa_flags=");
printflags(sigact_flags, sa.sa_flags, "SA_???");
-#if HAVE_SA_RESTORER && defined SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
+#if !(defined ALPHA || defined MIPS)
+ if (sa.sa_flags & 0x04000000U) {
+ tprints(", sa_restorer=");
+ printaddr(sa.sa_restorer);
+ }
#endif
tprints("}");
}
-int
-sys_sigaction(struct tcb *tcp)
+SYS_FUNC(sigaction)
{
if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
+ int signo = tcp->u_arg[0];
+#if defined SPARC || defined SPARC64
+ if (signo < 0) {
+ tprints("-");
+ signo = -signo;
+ }
+#endif
+ printsignal(signo);
tprints(", ");
decode_old_sigaction(tcp, tcp->u_arg[1]);
tprints(", ");
return 0;
}
-int
-sys_signal(struct tcb *tcp)
+SYS_FUNC(signal)
{
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
tprints(", ");
- switch (tcp->u_arg[1]) {
- case (long) SIG_ERR:
- tprints("SIG_ERR");
- break;
- case (long) SIG_DFL:
- tprints("SIG_DFL");
- break;
- case (long) SIG_IGN:
- tprints("SIG_IGN");
- break;
- default:
- tprintf("%#lx", tcp->u_arg[1]);
- }
+ print_sa_handler(tcp->u_arg[1]);
return 0;
- }
- else if (!syserror(tcp)) {
- switch (tcp->u_rval) {
- case (long) SIG_ERR:
- tcp->auxstr = "SIG_ERR"; break;
- case (long) SIG_DFL:
- tcp->auxstr = "SIG_DFL"; break;
- case (long) SIG_IGN:
- tcp->auxstr = "SIG_IGN"; break;
- default:
- tcp->auxstr = NULL;
- }
+ } else if (!syserror(tcp)) {
+ tcp->auxstr = get_sa_handler_str(tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
return 0;
}
-#endif /* HAVE_SIGACTION */
-
-int
-sys_sigreturn(struct tcb *tcp)
+SYS_FUNC(sgetmask)
{
-#if defined(ARM)
- if (entering(tcp)) {
- struct arm_sigcontext {
- unsigned long trap_no;
- unsigned long error_code;
- unsigned long oldmask;
- unsigned long arm_r0;
- unsigned long arm_r1;
- unsigned long arm_r2;
- unsigned long arm_r3;
- unsigned long arm_r4;
- unsigned long arm_r5;
- unsigned long arm_r6;
- unsigned long arm_r7;
- unsigned long arm_r8;
- unsigned long arm_r9;
- unsigned long arm_r10;
- unsigned long arm_fp;
- unsigned long arm_ip;
- unsigned long arm_sp;
- unsigned long arm_lr;
- unsigned long arm_pc;
- unsigned long arm_cpsr;
- unsigned long fault_address;
- };
- struct arm_ucontext {
- unsigned long uc_flags;
- unsigned long uc_link; /* struct ucontext* */
- /* The next three members comprise stack_t struct: */
- unsigned long ss_sp; /* void* */
- unsigned long ss_flags; /* int */
- unsigned long ss_size; /* size_t */
- struct arm_sigcontext sc;
- /* These two members are sigset_t: */
- unsigned long uc_sigmask[2];
- /* more fields follow, which we aren't interested in */
- };
- struct arm_ucontext uc;
- if (umove(tcp, arm_regs.ARM_sp, &uc) < 0)
- return 0;
- /*
- * Kernel fills out uc.sc.oldmask too when it sets up signal stack,
- * but for sigmask restore, sigreturn syscall uses uc.uc_sigmask instead.
- */
- tprintsigmask_addr(") (mask ", uc.uc_sigmask);
- }
-#elif defined(S390) || defined(S390X)
- if (entering(tcp)) {
- long usp;
- struct sigcontext sc;
- if (upeek(tcp->pid, PT_GPR15, &usp) < 0)
- return 0;
- if (umove(tcp, usp + __SIGNAL_FRAMESIZE, &sc) < 0)
- return 0;
- tprintsigmask_addr(") (mask ", sc.oldmask);
- }
-#elif defined I386 || defined X86_64 || defined X32
-# ifndef I386
- /* sys_sigreturn is i386 personality only */
- if (current_personality != 1)
- return 0;
-# endif
- if (entering(tcp)) {
- struct i386_sigcontext_struct {
- uint16_t gs, __gsh;
- uint16_t fs, __fsh;
- uint16_t es, __esh;
- uint16_t ds, __dsh;
- uint32_t edi;
- uint32_t esi;
- uint32_t ebp;
- uint32_t esp;
- uint32_t ebx;
- uint32_t edx;
- uint32_t ecx;
- uint32_t eax;
- uint32_t trapno;
- uint32_t err;
- uint32_t eip;
- uint16_t cs, __csh;
- uint32_t eflags;
- uint32_t esp_at_signal;
- uint16_t ss, __ssh;
- uint32_t i387;
- uint32_t oldmask;
- uint32_t cr2;
- };
- struct i386_fpstate {
- uint32_t cw;
- uint32_t sw;
- uint32_t tag;
- uint32_t ipoff;
- uint32_t cssel;
- uint32_t dataoff;
- uint32_t datasel;
- uint8_t st[8][10]; /* 8*10 bytes: FP regs */
- uint16_t status;
- uint16_t magic;
- uint32_t fxsr_env[6];
- uint32_t mxcsr;
- uint32_t reserved;
- uint8_t stx[8][16]; /* 8*16 bytes: FP regs, each padded to 16 bytes */
- uint8_t xmm[8][16]; /* 8 XMM regs */
- uint32_t padding1[44];
- uint32_t padding2[12]; /* union with struct _fpx_sw_bytes */
- };
- struct {
- struct i386_sigcontext_struct sc;
- struct i386_fpstate fp;
- uint32_t extramask[1];
- } signal_stack;
- /* On i386, sc is followed on stack by struct fpstate
- * and after it an additional u32 extramask[1] which holds
- * upper half of the mask.
- */
- uint32_t sigmask[2];
- if (umove(tcp, *i386_esp_ptr, &signal_stack) < 0)
- return 0;
- sigmask[0] = signal_stack.sc.oldmask;
- sigmask[1] = signal_stack.extramask[0];
- tprintsigmask_addr(") (mask ", sigmask);
- }
-#elif defined(IA64)
- if (entering(tcp)) {
- long addr;
- if (upeek(tcp->pid, PT_R12, &addr) < 0)
- return 0;
- /* offsetof(struct sigframe, sc) */
-# define OFFSETOF_STRUCT_SIGFRAME_SC 0xA0
- addr += 16 + OFFSETOF_STRUCT_SIGFRAME_SC +
- offsetof(struct sigcontext, sc_mask);
- tprints(") (mask ");
- print_sigset_addr_len(tcp, addr, NSIG / 8);
- }
-#elif defined(POWERPC)
- if (entering(tcp)) {
- long esp = ppc_regs.gpr[1];
- struct sigcontext sc;
-
- /* Skip dummy stack frame. */
-#ifdef POWERPC64
- if (current_personality == 0)
- esp += 128;
- else
-#endif
- esp += 64;
-
- tprints(") (mask ");
- if (umove(tcp, esp, &sc) < 0) {
- tprintf("%#lx", esp);
- } else {
- unsigned long mask[NSIG / 8 / sizeof(long)];
-#ifdef POWERPC64
- if (current_personality == 0)
- mask[0] = sc.oldmask | (sc._unused[3] << 32);
- else
-#endif
- {
- mask[0] = sc.oldmask;
- mask[1] = sc._unused[3];
- }
- tprintsigmask_val("", mask);
- }
- }
-#elif defined(M68K)
- if (entering(tcp)) {
- long usp;
- struct sigcontext sc;
- if (upeek(tcp->pid, 4*PT_USP, &usp) < 0)
- return 0;
- if (umove(tcp, usp, &sc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", sc.sc_mask);
- }
-#elif defined(ALPHA)
- if (entering(tcp)) {
- long fp;
- struct sigcontext sc;
- if (upeek(tcp->pid, REG_FP, &fp) < 0)
- return 0;
- if (umove(tcp, fp, &sc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", sc.sc_mask);
- }
-#elif defined(SPARC) || defined(SPARC64)
- if (entering(tcp)) {
- long fp = sparc_regs.u_regs[U_REG_FP] + sizeof(struct sparc_stackf);
- struct {
- m_siginfo_t si;
- void *fpu_save;
- long insns[2] __attribute__ ((aligned (8)));
- unsigned int extramask[NSIG / 8 / sizeof(int) - 1];
- } frame;
-
- tprints(") (mask ");
- if (umove(tcp, fp, &frame) < 0) {
- tprintf("%#lx", fp);
- } else {
- unsigned int mask[NSIG / 8 / sizeof(int)];
-
- mask[0] = frame.si.si_mask;
- memcpy(mask + 1, frame.extramask, sizeof(frame.extramask));
- tprintsigmask_val("", mask);
- }
- }
-#elif defined(LINUX_MIPSN32) || defined(LINUX_MIPSN64)
- /* This decodes rt_sigreturn. The 64-bit ABIs do not have
- sigreturn. */
- if (entering(tcp)) {
- struct ucontext uc;
- /* There are six words followed by a 128-byte siginfo. */
- long sp = mips_REG_SP + 6 * 4 + 128;
- if (umove(tcp, sp, &uc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", uc.uc_sigmask);
- }
-#elif defined(LINUX_MIPSO32)
- if (entering(tcp)) {
- m_siginfo_t si;
- if (umove(tcp, mips_REG_SP, &si) < 0)
- return 0;
- tprintsigmask_val(") (mask ", si.si_mask);
- }
-#elif defined(CRISV10) || defined(CRISV32)
- if (entering(tcp)) {
- struct sigcontext sc;
- long regs[PT_MAX+1];
- if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) {
- perror_msg("sigreturn: PTRACE_GETREGS");
- return 0;
- }
- if (umove(tcp, regs[PT_USP], &sc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", sc.oldmask);
- }
-#elif defined(TILE)
- if (entering(tcp)) {
- struct ucontext uc;
-
- /* offset of ucontext in the kernel's sigframe structure */
-# define SIGFRAME_UC_OFFSET C_ABI_SAVE_AREA_SIZE + sizeof(siginfo_t)
- if (umove(tcp, tile_regs.sp + SIGFRAME_UC_OFFSET, &uc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", uc.uc_sigmask);
- }
-#elif defined(MICROBLAZE)
- /* TODO: Verify that this is correct... */
- if (entering(tcp)) {
- struct sigcontext sc;
- long sp;
- /* Read r1, the stack pointer. */
- if (upeek(tcp->pid, 1 * 4, &sp) < 0)
- return 0;
- if (umove(tcp, sp, &sc) < 0)
- return 0;
- tprintsigmask_val(") (mask ", sc.oldmask);
+ if (exiting(tcp) && !syserror(tcp)) {
+ tcp->auxstr = sprint_old_sigmask_val("mask ", tcp->u_rval);
+ return RVAL_HEX | RVAL_STR;
}
-#else
-# warning sigreturn/rt_sigreturn signal mask decoding is not implemented for this architecture
-#endif
return 0;
}
-int
-sys_siggetmask(struct tcb *tcp)
-{
- if (exiting(tcp)) {
- tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);
- }
- return RVAL_HEX | RVAL_STR;
-}
-
-int
-sys_sigsuspend(struct tcb *tcp)
+SYS_FUNC(sigsuspend)
{
- if (entering(tcp)) {
- tprintsigmask_val("", tcp->u_arg[2]);
- }
- return 0;
-}
-
-#if !defined SS_ONSTACK
-#define SS_ONSTACK 1
-#define SS_DISABLE 2
+#ifdef MIPS
+ print_sigset_addr_len(tcp, tcp->u_arg[tcp->s_ent->nargs - 1],
+ current_wordsize);
+#else
+ tprint_old_sigmask_val("", tcp->u_arg[tcp->s_ent->nargs - 1]);
#endif
-#include "xlat/sigaltstack_flags.h"
-
-static void
-print_stack_t(struct tcb *tcp, unsigned long addr)
-{
- stack_t ss;
- int r;
-
- if (!addr) {
- tprints("NULL");
- return;
- }
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize != sizeof(ss.ss_sp) && current_wordsize == 4) {
- struct {
- uint32_t ss_sp;
- int32_t ss_flags;
- uint32_t ss_size;
- } ss32;
- r = umove(tcp, addr, &ss32);
- if (r >= 0) {
- memset(&ss, 0, sizeof(ss));
- ss.ss_sp = (void*)(unsigned long) ss32.ss_sp;
- ss.ss_flags = ss32.ss_flags;
- ss.ss_size = (unsigned long) ss32.ss_size;
- }
- } else
-#endif
- {
- r = umove(tcp, addr, &ss);
- }
- if (r < 0) {
- tprintf("%#lx", addr);
- } else {
- tprintf("{ss_sp=%#lx, ss_flags=", (unsigned long) ss.ss_sp);
- printflags(sigaltstack_flags, ss.ss_flags, "SS_???");
- tprintf(", ss_size=%lu}", (unsigned long) ss.ss_size);
- }
+ return RVAL_DECODED;
}
-int
-sys_sigaltstack(struct tcb *tcp)
+#ifdef ALPHA
+/*
+ * The OSF/1 sigprocmask is different: it doesn't pass in two pointers,
+ * but rather passes in the new bitmask as an argument and then returns
+ * the old bitmask. This "works" because we only have 64 signals to worry
+ * about. If you want more, use of the rt_sigprocmask syscall is required.
+ *
+ * Alpha:
+ * old = osf_sigprocmask(how, new);
+ * Everyone else:
+ * ret = sigprocmask(how, &new, &old, ...);
+ */
+SYS_FUNC(osf_sigprocmask)
{
if (entering(tcp)) {
- print_stack_t(tcp, tcp->u_arg[0]);
+ printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
+ tprintsigmask_val(", ", tcp->u_arg[1]);
}
- else {
- tprints(", ");
- print_stack_t(tcp, tcp->u_arg[1]);
+ else if (!syserror(tcp)) {
+ tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
+ return RVAL_HEX | RVAL_STR;
}
return 0;
}
-#ifdef HAVE_SIGACTION
+#else /* !ALPHA */
/* "Old" sigprocmask, which operates with word-sized signal masks */
-int
-sys_sigprocmask(struct tcb *tcp)
+SYS_FUNC(sigprocmask)
{
-# ifdef ALPHA
- if (entering(tcp)) {
- /*
- * Alpha/OSF is different: it doesn't pass in two pointers,
- * but rather passes in the new bitmask as an argument and
- * then returns the old bitmask. This "works" because we
- * only have 64 signals to worry about. If you want more,
- * use of the rt_sigprocmask syscall is required.
- * Alpha:
- * old = osf_sigprocmask(how, new);
- * Everyone else:
- * ret = sigprocmask(how, &new, &old, ...);
- */
- printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- tprintsigmask_val(", ", tcp->u_arg[1]);
- }
- else if (!syserror(tcp)) {
- tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
- return RVAL_HEX | RVAL_STR;
- }
-# else /* !ALPHA */
if (entering(tcp)) {
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
tprints(", ");
tprints(", ");
}
else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[2]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
+ print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
}
-# endif /* !ALPHA */
return 0;
}
+#endif /* !ALPHA */
-#endif /* HAVE_SIGACTION */
-
-int
-sys_kill(struct tcb *tcp)
+SYS_FUNC(kill)
{
- if (entering(tcp)) {
- tprintf("%ld, %s",
- widen_to_long(tcp->u_arg[0]),
- signame(tcp->u_arg[1])
- );
- }
- return 0;
+ tprintf("%d, %s",
+ (int) tcp->u_arg[0],
+ signame(tcp->u_arg[1]));
+
+ return RVAL_DECODED;
}
-int
-sys_tgkill(struct tcb *tcp)
+SYS_FUNC(tgkill)
{
- if (entering(tcp)) {
- tprintf("%ld, %ld, %s",
- widen_to_long(tcp->u_arg[0]),
- widen_to_long(tcp->u_arg[1]),
- signame(tcp->u_arg[2])
- );
- }
- return 0;
+ tprintf("%d, %d, %s",
+ (int) tcp->u_arg[0],
+ (int) tcp->u_arg[1],
+ signame(tcp->u_arg[2]));
+
+ return RVAL_DECODED;
}
-int
-sys_sigpending(struct tcb *tcp)
+SYS_FUNC(sigpending)
{
- if (exiting(tcp)) {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[0]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[0], current_wordsize);
- }
+ if (exiting(tcp))
+ print_sigset_addr_len(tcp, tcp->u_arg[0], current_wordsize);
return 0;
}
-int
-sys_rt_sigprocmask(struct tcb *tcp)
+SYS_FUNC(rt_sigprocmask)
{
- /* Note: arg[3] is the length of the sigset. Kernel requires NSIG / 8 */
+ /* Note: arg[3] is the length of the sigset. Kernel requires NSIG_BYTES */
if (entering(tcp)) {
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
tprints(", ");
tprints(", ");
}
else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[2]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
- tprintf(", %lu", tcp->u_arg[3]);
+ print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
return 0;
}
/* sa_handler may be a libc #define, need to use other name: */
#ifdef MIPS
unsigned int sa_flags;
- void (*__sa_handler)(int);
+ unsigned long sa_handler__;
#else
- void (*__sa_handler)(int);
+ unsigned long sa_handler__;
unsigned long sa_flags;
#endif /* !MIPS */
#if HAVE_SA_RESTORER
- void (*sa_restorer)(void);
+ unsigned long sa_restorer;
#endif
/* Kernel treats sa_mask as an array of longs. */
- unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
+ unsigned long sa_mask[NSIG / sizeof(long)];
};
/* Same for i386-on-x86_64 and similar cases */
struct new_sigaction32
{
- uint32_t __sa_handler;
+ uint32_t sa_handler__;
uint32_t sa_flags;
#if HAVE_SA_RESTORER
uint32_t sa_restorer;
#endif
- uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)];
+ uint32_t sa_mask[2 * (NSIG / sizeof(long))];
};
static void
-decode_new_sigaction(struct tcb *tcp, long addr)
+decode_new_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct new_sigaction sa;
- int r;
- if (!addr) {
- tprints("NULL");
- return;
- }
- if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
- tprintf("%#lx", addr);
- return;
- }
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize != sizeof(sa.sa_flags) && current_wordsize == 4) {
+#ifndef current_wordsize
+ if (current_wordsize < sizeof(sa.sa_handler__)) {
struct new_sigaction32 sa32;
- r = umove(tcp, addr, &sa32);
- if (r >= 0) {
- memset(&sa, 0, sizeof(sa));
- sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
- sa.sa_flags = sa32.sa_flags;
+
+ if (umove_or_printaddr(tcp, addr, &sa32))
+ return;
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_handler__ = sa32.sa_handler__;
+ sa.sa_flags = sa32.sa_flags;
#if HAVE_SA_RESTORER && defined SA_RESTORER
- sa.sa_restorer = (void*)(unsigned long)sa32.sa_restorer;
-#endif
- /* Kernel treats sa_mask as an array of longs.
- * For 32-bit process, "long" is uint32_t, thus, for example,
- * 32th bit in sa_mask will end up as bit 0 in sa_mask[1].
- * But for (64-bit) kernel, 32th bit in sa_mask is
- * 32th bit in 0th (64-bit) long!
- * For little-endian, it's the same.
- * For big-endian, we swap 32-bit words.
- */
- sa.sa_mask[0] = sa32.sa_mask[0] + ((long)(sa32.sa_mask[1]) << 32);
- }
+ sa.sa_restorer = sa32.sa_restorer;
+#endif
+ /* Kernel treats sa_mask as an array of longs.
+ * For 32-bit process, "long" is uint32_t, thus, for example,
+ * 32th bit in sa_mask will end up as bit 0 in sa_mask[1].
+ * But for (64-bit) kernel, 32th bit in sa_mask is
+ * 32th bit in 0th (64-bit) long!
+ * For little-endian, it's the same.
+ * For big-endian, we swap 32-bit words.
+ */
+ sa.sa_mask[0] = ULONG_LONG(sa32.sa_mask[0], sa32.sa_mask[1]);
} else
#endif
- {
- r = umove(tcp, addr, &sa);
- }
- if (r < 0) {
- tprints("{...}");
+ if (umove_or_printaddr(tcp, addr, &sa))
return;
- }
- /* Architectures using function pointers, like
- * hppa, may need to manipulate the function pointer
- * to compute the result of a comparison. However,
- * the __sa_handler function pointer exists only in
- * the address space of the traced process, and can't
- * be manipulated by strace. In order to prevent the
- * compiler from generating code to manipulate
- * __sa_handler we cast the function pointers to long. */
- if ((long)sa.__sa_handler == (long)SIG_ERR)
- tprints("{SIG_ERR, ");
- else if ((long)sa.__sa_handler == (long)SIG_DFL)
- tprints("{SIG_DFL, ");
- else if ((long)sa.__sa_handler == (long)SIG_IGN)
- tprints("{SIG_IGN, ");
- else
- tprintf("{%#lx, ", (long) sa.__sa_handler);
+
+ tprints("{sa_handler=");
+ print_sa_handler(sa.sa_handler__);
+ tprints(", sa_mask=");
/*
* Sigset size is in tcp->u_arg[4] (SPARC)
* or in tcp->u_arg[3] (all other),
* but kernel won't handle sys_rt_sigaction
* with wrong sigset size (just returns EINVAL instead).
- * We just fetch the right size, which is NSIG / 8.
+ * We just fetch the right size, which is NSIG_BYTES.
*/
tprintsigmask_val("", sa.sa_mask);
- tprints(", ");
+ tprints(", sa_flags=");
printflags(sigact_flags, sa.sa_flags, "SA_???");
#if HAVE_SA_RESTORER && defined SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
+ if (sa.sa_flags & SA_RESTORER) {
+ tprints(", sa_restorer=");
+ printaddr(sa.sa_restorer);
+ }
#endif
tprints("}");
}
-int
-sys_rt_sigaction(struct tcb *tcp)
+SYS_FUNC(rt_sigaction)
{
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
} else {
decode_new_sigaction(tcp, tcp->u_arg[2]);
#if defined(SPARC) || defined(SPARC64)
- tprintf(", %#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
+ tprintf(", %#" PRI_klx ", %" PRI_klu, tcp->u_arg[3], tcp->u_arg[4]);
#elif defined(ALPHA)
- tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
+ tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
#else
- tprintf(", %lu", tcp->u_arg[3]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
#endif
}
return 0;
}
-int
-sys_rt_sigpending(struct tcb *tcp)
+SYS_FUNC(rt_sigpending)
{
if (exiting(tcp)) {
/*
* One of the few syscalls where sigset size (arg[1])
- * is allowed to be <= NSIG / 8, not strictly ==.
+ * is allowed to be <= NSIG_BYTES, not strictly ==.
* This allows non-rt sigpending() syscall
* to reuse rt_sigpending() code in kernel.
*/
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[0]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
- tprintf(", %lu", tcp->u_arg[1]);
+ print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
+ tcp->u_arg[1], 1);
+ tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}
-int
-sys_rt_sigsuspend(struct tcb *tcp)
+SYS_FUNC(rt_sigsuspend)
{
- if (entering(tcp)) {
- /* NB: kernel requires arg[1] == NSIG / 8 */
- print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
- tprintf(", %lu", tcp->u_arg[1]);
- }
- return 0;
+ /* NB: kernel requires arg[1] == NSIG_BYTES */
+ print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+ tprintf(", %" PRI_klu, tcp->u_arg[1]);
+
+ return RVAL_DECODED;
}
static void
-print_sigqueueinfo(struct tcb *tcp, int sig, unsigned long uinfo)
+print_sigqueueinfo(struct tcb *const tcp, const int sig,
+ const kernel_ulong_t addr)
{
printsignal(sig);
tprints(", ");
- printsiginfo_at(tcp, uinfo);
+ printsiginfo_at(tcp, addr);
}
-int
-sys_rt_sigqueueinfo(struct tcb *tcp)
+SYS_FUNC(rt_sigqueueinfo)
{
- if (entering(tcp)) {
- tprintf("%lu, ", tcp->u_arg[0]);
- print_sigqueueinfo(tcp, tcp->u_arg[1], tcp->u_arg[2]);
- }
- return 0;
-}
+ tprintf("%d, ", (int) tcp->u_arg[0]);
+ print_sigqueueinfo(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-int
-sys_rt_tgsigqueueinfo(struct tcb *tcp)
-{
- if (entering(tcp)) {
- tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
- print_sigqueueinfo(tcp, tcp->u_arg[2], tcp->u_arg[3]);
- }
- return 0;
+ return RVAL_DECODED;
}
-int sys_rt_sigtimedwait(struct tcb *tcp)
+SYS_FUNC(rt_tgsigqueueinfo)
{
- /* NB: kernel requires arg[3] == NSIG / 8 */
- if (entering(tcp)) {
- print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[3]);
- tprints(", ");
- /* This is the only "return" parameter, */
- if (tcp->u_arg[1] != 0)
- return 0;
- /* ... if it's NULL, can decode all on entry */
- tprints("NULL, ");
- }
- else if (tcp->u_arg[1] != 0) {
- /* syscall exit, and u_arg[1] wasn't NULL */
- printsiginfo_at(tcp, tcp->u_arg[1]);
- tprints(", ");
- }
- else {
- /* syscall exit, and u_arg[1] was NULL */
- return 0;
- }
- print_timespec(tcp, tcp->u_arg[2]);
- tprintf(", %lu", tcp->u_arg[3]);
- return 0;
-};
+ tprintf("%d, %d, ", (int) tcp->u_arg[0], (int) tcp->u_arg[1]);
+ print_sigqueueinfo(tcp, tcp->u_arg[2], tcp->u_arg[3]);
-int
-sys_restart_syscall(struct tcb *tcp)
-{
- if (entering(tcp))
- tprints("<... resuming interrupted call ...>");
- return 0;
+ return RVAL_DECODED;
}
-static int
-do_signalfd(struct tcb *tcp, int flags_arg)
+SYS_FUNC(rt_sigtimedwait)
{
- /* NB: kernel requires arg[2] == NSIG / 8 */
+ /* NB: kernel requires arg[3] == NSIG_BYTES */
if (entering(tcp)) {
- printfd(tcp, tcp->u_arg[0]);
+ print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[3]);
tprints(", ");
- print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
- tprintf(", %lu", tcp->u_arg[2]);
- if (flags_arg >= 0) {
+ if (!(tcp->u_arg[1] && verbose(tcp))) {
+ /*
+ * This is the only "return" parameter,
+ * if we are not going to fetch it on exit,
+ * decode all parameters on entry.
+ */
+ printaddr(tcp->u_arg[1]);
tprints(", ");
- printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+ print_timespec(tcp, tcp->u_arg[2]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
+ } else {
+ char *sts = xstrdup(sprint_timespec(tcp, tcp->u_arg[2]));
+ set_tcb_priv_data(tcp, sts, free);
+ }
+ } else {
+ if (tcp->u_arg[1] && verbose(tcp)) {
+ printsiginfo_at(tcp, tcp->u_arg[1]);
+ tprints(", ");
+ tprints(get_tcb_priv_data(tcp));
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
+ }
+
+ if (!syserror(tcp) && tcp->u_rval) {
+ tcp->auxstr = signame(tcp->u_rval);
+ return RVAL_STR;
}
}
return 0;
-}
+};
-int
-sys_signalfd(struct tcb *tcp)
+SYS_FUNC(restart_syscall)
{
- return do_signalfd(tcp, -1);
-}
+ tprintf("<... resuming interrupted %s ...>",
+ tcp->s_prev_ent ? tcp->s_prev_ent->sys_name : "system call");
-int
-sys_signalfd4(struct tcb *tcp)
-{
- return do_signalfd(tcp, 3);
+ return RVAL_DECODED;
}
projects / strace / blobdiff