* 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 <signal.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. */
* 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 *
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) {
#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)
{
const kernel_ulong_t len, const unsigned int min_len)
{
/*
- * Here len is usually equal to NSIG / 8 or current_wordsize.
+ * Here len is usually equal to NSIG_BYTES or current_wordsize.
* But we code this defensively:
*/
- if (len < min_len || len > NSIG / 8) {
+ if (len < min_len || len > NSIG_BYTES) {
printaddr(addr);
return;
}
- int mask[NSIG / 8 / sizeof(int)] = {};
+ int mask[NSIG_BYTES / sizeof(int)] = {};
if (umoven_or_printaddr(tcp, addr, len, mask))
return;
tprints(sprintsigmask_n("", mask, len));
print_sigset_addr_len_limit(tcp, addr, len, current_wordsize);
}
-SYS_FUNC(sigsetmask)
+void
+print_sigset_addr(struct tcb *const tcp, const kernel_ulong_t addr)
+{
+ print_sigset_addr_len_limit(tcp, addr, NSIG_BYTES, NSIG_BYTES);
+}
+
+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;
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__;
- /* Kernel treats sa_mask as an array of longs. */
- unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
+ unsigned long sa_mask;
+#elif defined ALPHA
+ unsigned long sa_handler__;
+ unsigned long sa_mask;
+ unsigned int sa_flags;
#else
unsigned long sa_handler__;
unsigned long sa_mask;
unsigned long sa_flags;
-#endif /* !MIPS */
-#if HAVE_SA_RESTORER
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 *const tcp, const kernel_ulong_t addr)
{
struct old_sigaction sa;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize != sizeof(sa.sa_handler__) && current_wordsize == 4) {
- struct old_sigaction32 sa32;
+#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;
-#if HAVE_SA_RESTORER && defined SA_RESTORER
sa.sa_restorer = sa32.sa_restorer;
-#endif
sa.sa_mask = sa32.sa_mask;
} else
#endif
tprints("{sa_handler=");
print_sa_handler(sa.sa_handler__);
tprints(", sa_mask=");
-#ifdef MIPS
- tprintsigmask_addr("", sa.sa_mask);
-#else
- tprintsigmask_val("", sa.sa_mask);
-#endif
+ 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) {
+#if !(defined ALPHA || defined MIPS)
+ if (sa.sa_flags & 0x04000000U) {
tprints(", sa_restorer=");
printaddr(sa.sa_restorer);
}
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;
}
-SYS_FUNC(siggetmask)
+SYS_FUNC(sgetmask)
{
- if (exiting(tcp)) {
- tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);
+ if (exiting(tcp) && !syserror(tcp)) {
+ tcp->auxstr = sprint_old_sigmask_val("mask ", tcp->u_rval);
+ return RVAL_HEX | RVAL_STR;
}
- return RVAL_HEX | RVAL_STR;
+ return 0;
}
SYS_FUNC(sigsuspend)
{
- tprintsigmask_val("", tcp->u_arg[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
return RVAL_DECODED;
}
-/* "Old" sigprocmask, which operates with word-sized signal masks */
-SYS_FUNC(sigprocmask)
+#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)
{
-# 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]);
}
tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
-# else /* !ALPHA */
+ return 0;
+}
+
+#else /* !ALPHA */
+
+/* "Old" sigprocmask, which operates with word-sized signal masks */
+SYS_FUNC(sigprocmask)
+{
if (entering(tcp)) {
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
tprints(", ");
else {
print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
}
-# endif /* !ALPHA */
return 0;
}
+#endif /* !ALPHA */
SYS_FUNC(kill)
{
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(", ");
}
else {
print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
- tprintf(", %" PRI_kru, tcp->u_arg[3]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
return 0;
}
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
#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
{
struct new_sigaction sa;
-#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;
if (umove_or_printaddr(tcp, addr, &sa32))
* 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(", sa_flags=");
} else {
decode_new_sigaction(tcp, tcp->u_arg[2]);
#if defined(SPARC) || defined(SPARC64)
- tprintf(", %#" PRI_krx ", %" PRI_kru, 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(", %" PRI_kru ", %#" PRI_krx, tcp->u_arg[3], tcp->u_arg[4]);
+ tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
#else
- tprintf(", %" PRI_kru, tcp->u_arg[3]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
#endif
}
return 0;
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.
*/
print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
tcp->u_arg[1], 1);
- tprintf(", %" PRI_kru, tcp->u_arg[1]);
+ tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}
SYS_FUNC(rt_sigsuspend)
{
- /* NB: kernel requires arg[1] == NSIG / 8 */
+ /* NB: kernel requires arg[1] == NSIG_BYTES */
print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
- tprintf(", %" PRI_kru, tcp->u_arg[1]);
+ tprintf(", %" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
SYS_FUNC(rt_sigtimedwait)
{
- /* NB: kernel requires arg[3] == NSIG / 8 */
+ /* NB: kernel requires arg[3] == NSIG_BYTES */
if (entering(tcp)) {
print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[3]);
tprints(", ");
printaddr(tcp->u_arg[1]);
tprints(", ");
print_timespec(tcp, tcp->u_arg[2]);
- tprintf(", %" PRI_kru, tcp->u_arg[3]);
+ 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);
printsiginfo_at(tcp, tcp->u_arg[1]);
tprints(", ");
tprints(get_tcb_priv_data(tcp));
- tprintf(", %" PRI_kru, tcp->u_arg[3]);
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
if (!syserror(tcp) && tcp->u_rval) {
projects / strace / blobdiff