# endif
#endif
+#include "xlat/sa_handler_values.h"
#include "xlat/sigact_flags.h"
#include "xlat/sigprocmaskcmds.h"
* Use (NSIG / 8) 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)
{
}
static void
-print_sigset_addr_len_limit(struct tcb *tcp, long addr, long len, long min_len)
+print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
+ const kernel_ulong_t len, const unsigned int min_len)
{
/*
* Here len is usually equal to NSIG / 8 or current_wordsize.
}
void
-print_sigset_addr_len(struct tcb *tcp, long addr, long len)
+print_sigset_addr_len(struct tcb *const tcp, const kernel_ulong_t addr,
+ const kernel_ulong_t len)
{
print_sigset_addr_len_limit(tcp, addr, len, current_wordsize);
}
return 0;
}
-#ifdef HAVE_SIGACTION
-
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);
+ unsigned long sa_handler__;
/* 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_handler__;
uint32_t sa_mask;
uint32_t sa_flags;
#if HAVE_SA_RESTORER
};
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;
#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize != sizeof(sa.__sa_handler) && current_wordsize == 4) {
+ if (current_wordsize != sizeof(sa.sa_handler__) && current_wordsize == 4) {
struct old_sigaction32 sa32;
if (umove_or_printaddr(tcp, addr, &sa32))
return;
memset(&sa, 0, sizeof(sa));
- sa.__sa_handler = (void*)(uintptr_t)sa32.__sa_handler;
+ sa.sa_handler__ = 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;
+ sa.sa_restorer = sa32.sa_restorer;
#endif
sa.sa_mask = sa32.sa_mask;
} else
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. */
- tprints("{");
- 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
- printaddr((long) sa.__sa_handler);
- tprints(", ");
+ 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
- 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("}");
}
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:
- printaddr(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 */
-
SYS_FUNC(siggetmask)
{
if (exiting(tcp)) {
return RVAL_DECODED;
}
-#ifdef HAVE_SIGACTION
-
/* "Old" sigprocmask, which operates with word-sized signal masks */
SYS_FUNC(sigprocmask)
{
return 0;
}
-#endif /* HAVE_SIGACTION */
-
SYS_FUNC(kill)
{
- tprintf("%ld, %s",
- widen_to_long(tcp->u_arg[0]),
+ tprintf("%d, %s",
+ (int) tcp->u_arg[0],
signame(tcp->u_arg[1]));
return RVAL_DECODED;
SYS_FUNC(tgkill)
{
- tprintf("%ld, %ld, %s",
- widen_to_long(tcp->u_arg[0]),
- widen_to_long(tcp->u_arg[1]),
+ tprintf("%d, %d, %s",
+ (int) tcp->u_arg[0],
+ (int) tcp->u_arg[1],
signame(tcp->u_arg[2]));
return RVAL_DECODED;
}
else {
print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
- tprintf(", %lu", 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];
/* 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;
};
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;
return;
memset(&sa, 0, sizeof(sa));
- sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
+ 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;
+ 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,
* 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_mask[0] = ULONG_LONG(sa32.sa_mask[0], sa32.sa_mask[1]);
} else
#endif
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),
* We just fetch the right size, which is NSIG / 8.
*/
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("}");
}
} 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;
*/
print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
tcp->u_arg[1], 1);
- tprintf(", %lu", tcp->u_arg[1]);
+ tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}
{
/* 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]);
+ 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);
}
SYS_FUNC(rt_sigqueueinfo)
if (entering(tcp)) {
print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[3]);
tprints(", ");
- if (!tcp->u_arg[1]) {
+ if (!(tcp->u_arg[1] && verbose(tcp))) {
/*
* This is the only "return" parameter,
- * if it's NULL, decode all parameters on entry.
+ * if we are not going to fetch it on exit,
+ * decode all parameters on entry.
*/
- tprints("NULL, ");
+ printaddr(tcp->u_arg[1]);
+ tprints(", ");
print_timespec(tcp, tcp->u_arg[2]);
- tprintf(", %lu", tcp->u_arg[3]);
- tcp->auxstr = NULL;
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
} else {
- tcp->auxstr = sprint_timespec(tcp, tcp->u_arg[2]);
+ char *sts = xstrdup(sprint_timespec(tcp, tcp->u_arg[2]));
+ set_tcb_priv_data(tcp, sts, free);
}
} else {
- if (tcp->auxstr) {
+ if (tcp->u_arg[1] && verbose(tcp)) {
printsiginfo_at(tcp, tcp->u_arg[1]);
- tprintf(", %s, %lu", tcp->auxstr, tcp->u_arg[3]);
- tcp->auxstr = NULL;
+ tprints(", ");
+ tprints(get_tcb_priv_data(tcp));
+ tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
if (!syserror(tcp) && tcp->u_rval) {
projects / strace / blobdiff