#ifdef HAVE_SYS_REG_H
# include <sys/reg.h>
-# ifndef PTRACE_PEEKUSR
-# define PTRACE_PEEKUSR PTRACE_PEEKUSER
-# endif
-# ifndef PTRACE_POKEUSR
-# define PTRACE_POKEUSR PTRACE_POKEUSER
-# endif
#elif defined(HAVE_LINUX_PTRACE_H)
# undef PTRACE_SYSCALL
# ifdef HAVE_STRUCT_IA64_FPREG
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+# endif
# include <linux/ptrace.h>
+# undef ptrace_peeksiginfo_args
# undef ia64_fpreg
# undef pt_all_user_regs
#endif
#ifndef NSIG
# warning: NSIG is not defined, using 32
# define NSIG 32
+#elif NSIG < 32
+# error: NSIG < 32
#endif
#ifdef HAVE_SIGACTION
-#if defined I386 || defined X86_64 || defined X32
/* The libc headers do not define this constant since it should only be
used by the implementation. So we define it here. */
-# ifndef SA_RESTORER
-# define SA_RESTORER 0x04000000
+#ifndef SA_RESTORER
+# ifdef ASM_SA_RESTORER
+# define SA_RESTORER ASM_SA_RESTORER
# endif
#endif
-static const struct xlat sigact_flags[] = {
-#ifdef SA_RESTORER
- { SA_RESTORER, "SA_RESTORER" },
-#endif
-#ifdef SA_STACK
- { SA_STACK, "SA_STACK" },
-#endif
-#ifdef SA_RESTART
- { SA_RESTART, "SA_RESTART" },
-#endif
-#ifdef SA_INTERRUPT
- { SA_INTERRUPT, "SA_INTERRUPT" },
-#endif
-#ifdef SA_NODEFER
- { SA_NODEFER, "SA_NODEFER" },
-#endif
-#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
- { SA_NOMASK, "SA_NOMASK" },
-#endif
-#ifdef SA_RESETHAND
- { SA_RESETHAND, "SA_RESETHAND" },
-#endif
-#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
- { SA_ONESHOT, "SA_ONESHOT" },
-#endif
-#ifdef SA_SIGINFO
- { SA_SIGINFO, "SA_SIGINFO" },
-#endif
-#ifdef SA_RESETHAND
- { SA_RESETHAND, "SA_RESETHAND" },
-#endif
-#ifdef SA_ONSTACK
- { SA_ONSTACK, "SA_ONSTACK" },
-#endif
-#ifdef SA_NODEFER
- { SA_NODEFER, "SA_NODEFER" },
+/* Some arches define this in their headers, but don't actually have it,
+ so we have to delete the define. */
+#if defined(HPPA) || defined(IA64)
+# undef SA_RESTORER
#endif
-#ifdef SA_NOCLDSTOP
- { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
-#endif
-#ifdef SA_NOCLDWAIT
- { SA_NOCLDWAIT, "SA_NOCLDWAIT" },
-#endif
-#ifdef _SA_BSDCALL
- { _SA_BSDCALL, "_SA_BSDCALL" },
-#endif
-#ifdef SA_NOPTRACE
- { SA_NOPTRACE, "SA_NOPTRACE" },
-#endif
- { 0, NULL },
-};
-static const struct xlat sigprocmaskcmds[] = {
- { SIG_BLOCK, "SIG_BLOCK" },
- { SIG_UNBLOCK, "SIG_UNBLOCK" },
- { SIG_SETMASK, "SIG_SETMASK" },
-#ifdef SIG_SETMASK32
- { SIG_SETMASK32,"SIG_SETMASK32" },
-#endif
- { 0, NULL },
-};
+#include "xlat/sigact_flags.h"
+#include "xlat/sigprocmaskcmds.h"
#endif /* HAVE_SIGACTION */
*/
const char *
-signame(int sig)
+signame(const int sig)
{
- static char buf[sizeof("SIGRT_%d") + sizeof(int)*3];
+ static char buf[sizeof("SIGRT_%u") + sizeof(int)*3];
+
+ if (sig >= 0) {
+ const unsigned int s = sig;
- if (sig >= 0 && sig < nsignals)
- return signalent[sig];
+ if (s < nsignals)
+ return signalent[s];
#ifdef SIGRTMIN
- if (sig >= __SIGRTMIN && sig <= __SIGRTMAX) {
- sprintf(buf, "SIGRT_%d", (int)(sig - __SIGRTMIN));
- return buf;
- }
+ if (s >= __SIGRTMIN && s <= __SIGRTMAX) {
+ sprintf(buf, "SIGRT_%u", s - __SIGRTMIN);
+ return buf;
+ }
#endif
+ }
sprintf(buf, "%d", sig);
return buf;
}
-static void
-long_to_sigset(long l, sigset_t *s)
+static unsigned int
+popcount32(const uint32_t *a, unsigned int size)
{
- sigemptyset(s);
- *(long *)s = l;
+ unsigned int count = 0;
+
+ for (; size; ++a, --size) {
+ uint32_t x = *a;
+
+#ifdef HAVE___BUILTIN_POPCOUNT
+ count += __builtin_popcount(x);
+#else
+ for (; x; ++count)
+ x &= x - 1;
+#endif
+ }
+
+ return count;
}
static const char *
-sprintsigmask(const char *str, sigset_t *mask, int rt)
-/* set might include realtime sigs */
+sprintsigmask_n(const char *prefix, const void *sig_mask, unsigned int bytes)
{
- /* Was [8 * sizeof(sigset_t) * 8], but
- * glibc sigset_t is huge (1024 bits = 128 *bytes*),
- * and we were ending up with 8k (!) buffer here.
- *
- * No Unix system can have sig > 255
- * (waitpid API won't be able to indicate death from one)
- * and sig 0 doesn't exist either.
- * Therefore max possible no of sigs is 255: 1..255
+ /*
+ * The maximum number of signal names to be printed is NSIG * 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[8 * (255 * 2 / 3)];
+ static char outstr[128 + 8 * (NSIG * 2 / 3)];
- int i, nsigs;
- int maxsigs;
- int show_members;
- char sep;
char *s;
+ const uint32_t *mask;
+ uint32_t inverted_mask[NSIG / 32];
+ unsigned int size;
+ int i;
+ char sep;
- /* Note: nsignals = ARRAY_SIZE(signalent[]),
- * and that array may not have SIGRTnn.
- */
- maxsigs = nsignals;
-#ifdef __SIGRTMAX
- if (rt)
- maxsigs = __SIGRTMAX + 1; /* instead */
-#endif
- s = stpcpy(outstr, str);
- nsigs = 0;
- for (i = 1; i < maxsigs; i++) {
- if (sigismember(mask, i) == 1)
- nsigs++;
- }
+ s = stpcpy(outstr, prefix);
+
+ mask = sig_mask;
+ /* length of signal mask in 4-byte words */
+ size = (bytes >= NSIG / 8) ? NSIG / 32 : (bytes + 3) / 4;
- /* 1: show mask members, 0: show those which are NOT in mask */
- show_members = (nsigs < nsignals * 2 / 3);
- if (!show_members)
+ /* check whether 2/3 or more bits are set */
+ if (popcount32(mask, size) >= size * 32 * 2 / 3) {
+ /* show those signals that are NOT in the mask */
+ unsigned int j;
+ for (j = 0; j < size; ++j)
+ inverted_mask[j] = ~mask[j];
+ mask = inverted_mask;
*s++ = '~';
+ }
sep = '[';
- for (i = 1; i < maxsigs; i++) {
- if (sigismember(mask, i) == show_members) {
- *s++ = sep;
- if (i < nsignals) {
- s = stpcpy(s, signalent[i] + 3);
- }
+ for (i = 0; (i = next_set_bit(mask, i, size * 32)) >= 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);
- }
-#endif /* SIGRTMIN */
- else {
- s += sprintf(s, "%u", i);
- }
- sep = ' ';
+ else if (i >= __SIGRTMIN && i <= __SIGRTMAX) {
+ s += sprintf(s, "RT_%u", i - __SIGRTMIN);
+ }
+#endif
+ else {
+ s += sprintf(s, "%u", i);
}
+ sep = ' ';
}
if (sep == '[')
*s++ = sep;
return outstr;
}
-static void
-printsigmask(sigset_t *mask, int rt)
-{
- tprints(sprintsigmask("", mask, rt));
-}
+#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)))
void
printsignal(int nr)
void
print_sigset_addr_len(struct tcb *tcp, long addr, long len)
{
- sigset_t ss;
+ char mask[NSIG / 8];
if (!addr) {
tprints("NULL");
tprintf("%#lx", addr);
return;
}
- if (len > NSIG / 8)
+ if (len >= NSIG / 8)
len = NSIG / 8;
- sigemptyset(&ss);
- if (umoven(tcp, addr, len, (char *)&ss) < 0)
+ else
+ len = (len + 3) & ~3;
+
+ if (umoven(tcp, addr, len, mask) < 0)
goto bad;
- printsigmask(&ss, /*rt:*/ 1);
+ tprints(sprintsigmask_n("", mask, len));
}
#ifndef ILL_ILLOPC
#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 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
# define SI_FROMUSER(sip) ((sip)->si_code <= 0)
#endif
-static const struct xlat siginfo_codes[] = {
-#ifdef SI_KERNEL
- { SI_KERNEL, "SI_KERNEL" },
-#endif
-#ifdef SI_USER
- { SI_USER, "SI_USER" },
-#endif
-#ifdef SI_QUEUE
- { SI_QUEUE, "SI_QUEUE" },
-#endif
-#ifdef SI_TIMER
- { SI_TIMER, "SI_TIMER" },
-#endif
-#ifdef SI_MESGQ
- { SI_MESGQ, "SI_MESGQ" },
-#endif
-#ifdef SI_ASYNCIO
- { SI_ASYNCIO, "SI_ASYNCIO" },
-#endif
-#ifdef SI_SIGIO
- { SI_SIGIO, "SI_SIGIO" },
-#endif
-#ifdef SI_TKILL
- { SI_TKILL, "SI_TKILL" },
-#endif
-#ifdef SI_ASYNCNL
- { SI_ASYNCNL, "SI_ASYNCNL" },
-#endif
-#ifdef SI_NOINFO
- { SI_NOINFO, "SI_NOINFO" },
-#endif
-#ifdef SI_LWP
- { SI_LWP, "SI_LWP" },
-#endif
- { 0, NULL },
-};
-
-static const struct xlat sigill_codes[] = {
- { ILL_ILLOPC, "ILL_ILLOPC" },
- { ILL_ILLOPN, "ILL_ILLOPN" },
- { ILL_ILLADR, "ILL_ILLADR" },
- { ILL_ILLTRP, "ILL_ILLTRP" },
- { ILL_PRVOPC, "ILL_PRVOPC" },
- { ILL_PRVREG, "ILL_PRVREG" },
- { ILL_COPROC, "ILL_COPROC" },
- { ILL_BADSTK, "ILL_BADSTK" },
- { 0, NULL },
-};
-
-static const struct xlat sigfpe_codes[] = {
- { FPE_INTDIV, "FPE_INTDIV" },
- { FPE_INTOVF, "FPE_INTOVF" },
- { FPE_FLTDIV, "FPE_FLTDIV" },
- { FPE_FLTOVF, "FPE_FLTOVF" },
- { FPE_FLTUND, "FPE_FLTUND" },
- { FPE_FLTRES, "FPE_FLTRES" },
- { FPE_FLTINV, "FPE_FLTINV" },
- { FPE_FLTSUB, "FPE_FLTSUB" },
- { 0, NULL },
-};
-
-static const struct xlat sigtrap_codes[] = {
- { TRAP_BRKPT, "TRAP_BRKPT" },
- { TRAP_TRACE, "TRAP_TRACE" },
- { 0, NULL },
-};
-
-static const struct xlat sigchld_codes[] = {
- { CLD_EXITED, "CLD_EXITED" },
- { CLD_KILLED, "CLD_KILLED" },
- { CLD_DUMPED, "CLD_DUMPED" },
- { CLD_TRAPPED, "CLD_TRAPPED" },
- { CLD_STOPPED, "CLD_STOPPED" },
- { CLD_CONTINUED,"CLD_CONTINUED" },
- { 0, NULL },
-};
-
-static const struct xlat sigpoll_codes[] = {
- { POLL_IN, "POLL_IN" },
- { POLL_OUT, "POLL_OUT" },
- { POLL_MSG, "POLL_MSG" },
- { POLL_ERR, "POLL_ERR" },
- { POLL_PRI, "POLL_PRI" },
- { POLL_HUP, "POLL_HUP" },
- { 0, NULL },
-};
-
-static const struct xlat sigprof_codes[] = {
-#ifdef PROF_SIG
- { PROF_SIG, "PROF_SIG" },
-#endif
- { 0, NULL },
-};
+#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
-static const struct xlat sigemt_codes[] = {
-#ifdef EMT_TAGOVF
- { EMT_TAGOVF, "EMT_TAGOVF" },
+#include "xlat/sigemt_codes.h"
#endif
- { 0, NULL },
-};
+
+#include "xlat/sigsegv_codes.h"
+#include "xlat/sigbus_codes.h"
+
+#ifndef SYS_SECCOMP
+# define SYS_SECCOMP 1
#endif
+#include "xlat/sigsys_codes.h"
-static const struct xlat sigsegv_codes[] = {
- { SEGV_MAPERR, "SEGV_MAPERR" },
- { SEGV_ACCERR, "SEGV_ACCERR" },
- { 0, NULL },
-};
+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 const struct xlat sigbus_codes[] = {
- { BUS_ADRALN, "BUS_ADRALN" },
- { BUS_ADRERR, "BUS_ADRERR" },
- { BUS_OBJERR, "BUS_OBJERR" },
- { 0, NULL },
-};
+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(siginfo_t *sip, int verbose)
case SIGBUS:
code = xlookup(sigbus_codes, sip->si_code);
break;
+ case SIGSYS:
+ code = xlookup(sigsys_codes, sip->si_code);
+ break;
}
}
if (code)
#endif
{
if (sip->si_errno) {
- if (sip->si_errno < 0 || sip->si_errno >= nerrnos)
+ if (sip->si_errno < 0 || (unsigned) sip->si_errno >= nerrnos)
tprintf(", si_errno=%d", sip->si_errno);
else
tprintf(", si_errno=%s",
}
#ifdef SI_FROMUSER
if (SI_FROMUSER(sip)) {
- tprintf(", si_pid=%lu, si_uid=%lu",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
switch (sip->si_code) {
#ifdef SI_USER
case SI_USER:
+ printsigsource(sip);
break;
#endif
#ifdef SI_TKILL
case SI_TKILL:
+ printsigsource(sip);
break;
#endif
#ifdef SI_TIMER
case SI_TIMER:
- tprintf(", si_value=%d", sip->si_int);
+ tprintf(", si_timerid=%#x, si_overrun=%d",
+ sip->si_timerid, sip->si_overrun);
+ printsigval(sip, verbose);
break;
#endif
default:
- if (!sip->si_ptr)
- break;
- if (!verbose)
- tprints(", ...");
- else
- tprintf(", si_value={int=%u, ptr=%#lx}",
- sip->si_int,
- (unsigned long) sip->si_ptr);
+ printsigsource(sip);
+ if (sip->si_ptr)
+ printsigval(sip, verbose);
break;
}
}
{
switch (sip->si_signo) {
case SIGCHLD:
- tprintf(", si_pid=%ld, si_status=",
- (long) sip->si_pid);
+ printsigsource(sip);
+ tprints(", si_status=");
if (sip->si_code == CLD_EXITED)
tprintf("%d", sip->si_status);
else
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)
- tprintf(", si_pid=%lu, si_uid=%lu",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
- if (!sip->si_ptr)
- break;
- if (!verbose)
- tprints(", ...");
- else {
- tprintf(", si_value={int=%u, ptr=%#lx}",
- sip->si_int,
- (unsigned long) sip->si_ptr);
- }
-
+ printsigsource(sip);
+ if (sip->si_ptr)
+ printsigval(sip, verbose);
}
}
}
sys_sigsetmask(struct tcb *tcp)
{
if (entering(tcp)) {
- sigset_t sigm;
- long_to_sigset(tcp->u_arg[0], &sigm);
- printsigmask(&sigm, 0);
+ tprintsigmask_val("", tcp->u_arg[0]);
}
else if (!syserror(tcp)) {
- sigset_t sigm;
- long_to_sigset(tcp->u_rval, &sigm);
- tcp->auxstr = sprintsigmask("old mask ", &sigm, 0);
-
+ tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
return 0;
struct old_sigaction {
/* sa_handler may be a libc #define, need to use other name: */
+#ifdef MIPS
+ 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_mask;
unsigned long sa_flags;
+#endif /* !MIPS */
+#ifdef SA_RESTORER
void (*sa_restorer)(void);
+#endif
};
-int
-sys_sigaction(struct tcb *tcp)
+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;
+#ifdef SA_RESTORER
+ uint32_t sa_restorer;
+#endif
+};
+
+static void
+decode_old_sigaction(struct tcb *tcp, long addr)
{
- long addr;
- sigset_t sigset;
struct old_sigaction sa;
+ int r;
- if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
- tprints(", ");
- addr = tcp->u_arg[1];
- } else
- addr = tcp->u_arg[2];
- if (addr == 0)
+ if (!addr) {
tprints("NULL");
- else if (!verbose(tcp))
+ return;
+ }
+ if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
tprintf("%#lx", addr);
- else if (umove(tcp, addr, &sa) < 0)
- tprints("{...}");
- else {
- /* 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);
- long_to_sigset(sa.sa_mask, &sigset);
- printsigmask(&sigset, 0);
- tprints(", ");
- printflags(sigact_flags, sa.sa_flags, "SA_???");
+ 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;
#ifdef SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
+ sa.sa_restorer = (void*)(uintptr_t)sa32.sa_restorer;
#endif
- tprints("}");
+ sa.sa_mask = sa32.sa_mask;
+ }
+ } else
+#endif
+ {
+ r = umove(tcp, addr, &sa);
}
- if (entering(tcp))
- tprints(", ");
+ if (r < 0) {
+ tprints("{...}");
+ 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", (unsigned long) sa.sa_restorer);
+ tprintf("{%#lx, ", (long) sa.__sa_handler);
+#ifdef MIPS
+ tprintsigmask_addr("", sa.sa_mask);
+#else
+ tprintsigmask_val("", sa.sa_mask);
+#endif
+ tprints(", ");
+ printflags(sigact_flags, sa.sa_flags, "SA_???");
+#ifdef SA_RESTORER
+ if (sa.sa_flags & SA_RESTORER)
+ tprintf(", %p", sa.sa_restorer);
+#endif
+ tprints("}");
+}
+
+int
+sys_sigaction(struct tcb *tcp)
+{
+ if (entering(tcp)) {
+ printsignal(tcp->u_arg[0]);
+ tprints(", ");
+ decode_old_sigaction(tcp, tcp->u_arg[1]);
+ tprints(", ");
+ } else
+ decode_old_sigaction(tcp, tcp->u_arg[2]);
return 0;
}
/* more fields follow, which we aren't interested in */
};
struct arm_ucontext uc;
- sigset_t sigm;
if (umove(tcp, arm_regs.ARM_sp, &uc) < 0)
return 0;
- /* Kernel fills out uc.sc.oldmask too when it sets up signal stack,
+ /*
+ * Kernel fills out uc.sc.oldmask too when it sets up signal stack,
* but for sigmask restore, sigreturn syscall uses uc.uc_sigmask instead.
- * long_to_sigset(uc.sc.oldmask, &sigm);
- * tprints(sprintsigmask(") (mask ", &sigm, 0));
*/
- sigemptyset(&sigm);
- ((uint32_t*)&sigm)[0] = uc.uc_sigmask[0];
- ((uint32_t*)&sigm)[1] = uc.uc_sigmask[1];
- tprints(sprintsigmask(") (mask ", &sigm, /*rt:*/ 1));
+ tprintsigmask_addr(") (mask ", uc.uc_sigmask);
}
#elif defined(S390) || defined(S390X)
if (entering(tcp)) {
long usp;
- struct sigcontext_struct sc;
+ struct sigcontext sc;
if (upeek(tcp->pid, PT_GPR15, &usp) < 0)
return 0;
if (umove(tcp, usp + __SIGNAL_FRAMESIZE, &sc) < 0)
return 0;
- tprints(sprintsigmask(") (mask ", (sigset_t *)&sc.oldmask[0], 0));
+ tprintsigmask_addr(") (mask ", sc.oldmask);
}
#elif defined(I386) || defined(X86_64)
# if defined(X86_64)
* and after it an additional u32 extramask[1] which holds
* upper half of the mask.
*/
- sigset_t sigm;
+ uint32_t sigmask[2];
if (umove(tcp, *i386_esp_ptr, &signal_stack) < 0)
return 0;
- sigemptyset(&sigm);
- ((uint32_t*)&sigm)[0] = signal_stack.sc.oldmask;
- ((uint32_t*)&sigm)[1] = signal_stack.extramask[0];
- tprints(sprintsigmask(") (mask ", &sigm, /*RT sigs too?:*/ 1));
+ sigmask[0] = signal_stack.sc.oldmask;
+ sigmask[1] = signal_stack.extramask[0];
+ tprintsigmask_addr(") (mask ", sigmask);
}
#elif defined(IA64)
if (entering(tcp)) {
struct sigcontext sc;
long sp;
- sigset_t sigm;
/* offset of sigcontext in the kernel's sigframe structure: */
# define SIGFRAME_SC_OFFSET 0x90
if (upeek(tcp->pid, PT_R12, &sp) < 0)
return 0;
if (umove(tcp, sp + 16 + SIGFRAME_SC_OFFSET, &sc) < 0)
return 0;
- sigemptyset(&sigm);
- memcpy(&sigm, &sc.sc_mask, NSIG / 8);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.sc_mask);
}
#elif defined(POWERPC)
if (entering(tcp)) {
long esp;
- struct sigcontext_struct sc;
- sigset_t sigm;
+ struct sigcontext sc;
esp = ppc_regs.gpr[1];
#endif
if (umove(tcp, esp, &sc) < 0)
return 0;
- long_to_sigset(sc.oldmask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.oldmask);
}
#elif defined(M68K)
if (entering(tcp)) {
long usp;
struct sigcontext sc;
- sigset_t sigm;
if (upeek(tcp->pid, 4*PT_USP, &usp) < 0)
return 0;
if (umove(tcp, usp, &sc) < 0)
return 0;
- long_to_sigset(sc.sc_mask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.sc_mask);
}
#elif defined(ALPHA)
if (entering(tcp)) {
long fp;
- struct sigcontext_struct sc;
- sigset_t sigm;
+ struct sigcontext sc;
if (upeek(tcp->pid, REG_FP, &fp) < 0)
return 0;
if (umove(tcp, fp, &sc) < 0)
return 0;
- long_to_sigset(sc.sc_mask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.sc_mask);
}
#elif defined(SPARC) || defined(SPARC64)
if (entering(tcp)) {
long i1;
m_siginfo_t si;
- sigset_t sigm;
i1 = sparc_regs.u_regs[U_REG_O1];
if (umove(tcp, i1, &si) < 0) {
perror_msg("sigreturn: umove");
return 0;
}
- long_to_sigset(si.si_mask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", si.si_mask);
}
#elif defined(LINUX_MIPSN32) || defined(LINUX_MIPSN64)
/* This decodes rt_sigreturn. The 64-bit ABIs do not have
if (entering(tcp)) {
long sp;
struct ucontext uc;
- sigset_t sigm;
if (upeek(tcp->pid, REG_SP, &sp) < 0)
return 0;
/* There are six words followed by a 128-byte siginfo. */
sp = sp + 6 * 4 + 128;
if (umove(tcp, sp, &uc) < 0)
return 0;
- long_to_sigset(*(long *) &uc.uc_sigmask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", uc.uc_sigmask);
}
#elif defined(MIPS)
if (entering(tcp)) {
long sp;
struct pt_regs regs;
m_siginfo_t si;
- sigset_t sigm;
if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
perror_msg("sigreturn: PTRACE_GETREGS");
return 0;
sp = regs.regs[29];
if (umove(tcp, sp, &si) < 0)
return 0;
- long_to_sigset(si.si_mask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", si.si_mask);
}
#elif defined(CRISV10) || defined(CRISV32)
if (entering(tcp)) {
struct sigcontext sc;
long regs[PT_MAX+1];
- sigset_t sigm;
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;
- long_to_sigset(sc.oldmask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.oldmask);
}
#elif defined(TILE)
if (entering(tcp)) {
struct ucontext uc;
- sigset_t sigm;
/* 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;
- sigemptyset(&sigm);
- memcpy(&sigm, &uc.uc_sigmask, NSIG / 8);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", uc.uc_sigmask);
}
#elif defined(MICROBLAZE)
/* TODO: Verify that this is correct... */
if (entering(tcp)) {
struct sigcontext sc;
long sp;
- sigset_t sigm;
/* Read r1, the stack pointer. */
if (upeek(tcp->pid, 1 * 4, &sp) < 0)
return 0;
if (umove(tcp, sp, &sc) < 0)
return 0;
- long_to_sigset(sc.oldmask, &sigm);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
+ tprintsigmask_val(") (mask ", sc.oldmask);
}
#elif defined(XTENSA)
/* Xtensa only has rt_sys_sigreturn */
+#elif defined(ARC)
+ /* ARC syscall ABI only supports rt_sys_sigreturn */
#else
# warning No sys_sigreturn() for this architecture
# warning (no problem, just a reminder :-)
sys_siggetmask(struct tcb *tcp)
{
if (exiting(tcp)) {
- sigset_t sigm;
- long_to_sigset(tcp->u_rval, &sigm);
- tcp->auxstr = sprintsigmask("mask ", &sigm, 0);
+ tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);
}
return RVAL_HEX | RVAL_STR;
}
sys_sigsuspend(struct tcb *tcp)
{
if (entering(tcp)) {
- sigset_t sigm;
- long_to_sigset(tcp->u_arg[2], &sigm);
- printsigmask(&sigm, 0);
+ tprintsigmask_val("", tcp->u_arg[2]);
}
return 0;
}
#define SS_DISABLE 2
#endif
-static const struct xlat sigaltstack_flags[] = {
- { SS_ONSTACK, "SS_ONSTACK" },
- { SS_DISABLE, "SS_DISABLE" },
- { 0, NULL },
-};
+#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");
- } else if (umove(tcp, addr, &ss) < 0) {
+ 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);
sys_sigprocmask(struct tcb *tcp)
{
# ifdef ALPHA
- sigset_t ss;
if (entering(tcp)) {
/*
* Alpha/OSF is different: it doesn't pass in two pointers,
* ret = sigprocmask(how, &new, &old, ...);
*/
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- long_to_sigset(tcp->u_arg[1], &ss);
- tprints(sprintsigmask(", ", &ss, 0));
+ tprintsigmask_val(", ", tcp->u_arg[1]);
}
else if (!syserror(tcp)) {
- long_to_sigset(tcp->u_rval, &ss);
- tcp->auxstr = sprintsigmask("old mask ", &ss, 0);
+ tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
# else /* !ALPHA */
struct new_sigaction
{
/* sa_handler may be a libc #define, need to use other name: */
+#ifdef MIPS
+ unsigned int sa_flags;
+ void (*__sa_handler)(int);
+#else
void (*__sa_handler)(int);
unsigned long sa_flags;
+#endif /* !MIPS */
+#ifdef SA_RESTORER
void (*sa_restorer)(void);
+#endif
/* Kernel treats sa_mask as an array of longs. */
unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
};
{
uint32_t __sa_handler;
uint32_t sa_flags;
+#ifdef SA_RESTORER
uint32_t sa_restorer;
+#endif
uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)];
};
-int
-sys_rt_sigaction(struct tcb *tcp)
+static void
+decode_new_sigaction(struct tcb *tcp, long addr)
{
struct new_sigaction sa;
- sigset_t sigset;
- long addr;
int r;
- if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
- tprints(", ");
- addr = tcp->u_arg[1];
- } else
- addr = tcp->u_arg[2];
-
- if (addr == 0) {
+ if (!addr) {
tprints("NULL");
- goto after_sa;
+ return;
}
- if (!verbose(tcp)) {
+ if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
tprintf("%#lx", addr);
- goto after_sa;
+ return;
}
#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
if (current_wordsize != sizeof(sa.sa_flags) && current_wordsize == 4) {
memset(&sa, 0, sizeof(sa));
sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
sa.sa_flags = sa32.sa_flags;
+#ifdef 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].
}
if (r < 0) {
tprints("{...}");
- goto after_sa;
+ return;
}
/* Architectures using function pointers, like
* hppa, may need to manipulate the function pointer
* with wrong sigset size (just returns EINVAL instead).
* We just fetch the right size, which is NSIG / 8.
*/
- sigemptyset(&sigset);
- memcpy(&sigset, &sa.sa_mask, NSIG / 8);
- printsigmask(&sigset, /*rt:*/ 1);
+ tprintsigmask_val("", sa.sa_mask);
tprints(", ");
printflags(sigact_flags, sa.sa_flags, "SA_???");
tprintf(", %p", sa.sa_restorer);
#endif
tprints("}");
+}
- after_sa:
- if (entering(tcp))
+int
+sys_rt_sigaction(struct tcb *tcp)
+{
+ if (entering(tcp)) {
+ printsignal(tcp->u_arg[0]);
tprints(", ");
- else
+ decode_new_sigaction(tcp, tcp->u_arg[1]);
+ tprints(", ");
+ } 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]);
#elif defined(ALPHA)
#else
tprintf(", %lu", tcp->u_arg[3]);
#endif
+ }
return 0;
}
projects / strace / blobdiff