* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
*/
#include "defs.h"
-
-#include <signal.h>
#include <sys/user.h>
#include <fcntl.h>
-#ifdef SVR4
-#include <sys/ucontext.h>
-#endif /* SVR4 */
-
#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
+# 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
+# undef PTRACE_SYSCALL
# ifdef HAVE_STRUCT_IA64_FPREG
# define ia64_fpreg XXX_ia64_fpreg
# endif
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
-#include <linux/ptrace.h>
+# include <linux/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
#endif
-
-#ifdef LINUX
-
#ifdef IA64
# include <asm/ptrace_offsets.h>
-#endif /* !IA64 */
+#endif
-#if HAVE_ASM_REG_H
-# if defined (SPARC) || defined (SPARC64)
-# define fpq kernel_fpq
-# define fq kernel_fq
-# define fpu kernel_fpu
-# endif
-# include <asm/reg.h>
-# if defined (SPARC) || defined (SPARC64)
-# undef fpq
-# undef fq
-# undef fpu
-# endif
-#if defined (LINUX) && defined (SPARC64)
-# define r_pc r_tpc
-# undef PTRACE_GETREGS
-# define PTRACE_GETREGS PTRACE_GETREGS64
-# undef PTRACE_SETREGS
-# define PTRACE_SETREGS PTRACE_SETREGS64
-#endif /* LINUX && SPARC64 */
-#endif /* HAVE_ASM_REG_H */
-
-#if defined (SPARC) || defined (SPARC64)
-typedef struct {
- struct regs si_regs;
- int si_mask;
-} m_siginfo_t;
-#elif defined (MIPS)
+#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)
-#include <asm/sigcontext.h>
-#endif /* !IA64 && !X86_64 */
+# if !defined(IA64) && !defined(X86_64) && !defined(X32)
+#
include <asm/sigcontext.h>
+# endif
#else /* !HAVE_ASM_SIGCONTEXT_H */
-#ifdef I386
+# if defined I386 && !defined HAVE_STRUCT_SIGCONTEXT_STRUCT
struct sigcontext_struct {
unsigned short gs, __gsh;
unsigned short fs, __fsh;
unsigned long oldmask;
unsigned long cr2;
};
-#else /* !I386 */
-#ifdef M68K
+# else /* !I386 */
+# if defined M68K && !defined HAVE_STRUCT_SIGCONTEXT
struct sigcontext
{
unsigned long sc_mask;
unsigned long sc_pc;
unsigned short sc_formatvec;
};
-#endif /* M68K */
-#endif /* !I386 */
+# endif /* M68K */
+# endif /* !I386 */
#endif /* !HAVE_ASM_SIGCONTEXT_H */
+
#ifndef NSIG
-#define NSIG 32
+# warning: NSIG is not defined, using 32
+# define NSIG 32
#endif
#ifdef ARM
-#undef NSIG
-#define NSIG 32
+/* Ugh. Is this really correct? ARM has no RT signals?! */
+# undef NSIG
+# define NSIG 32
#endif
-#endif /* LINUX */
-
-const char *const signalent0[] = {
-#include "signalent.h"
-};
-const int nsignals0 = sizeof signalent0 / sizeof signalent0[0];
-
-#if SUPPORTED_PERSONALITIES >= 2
-const char *const signalent1[] = {
-#include "signalent1.h"
-};
-const int nsignals1 = sizeof signalent1 / sizeof signalent1[0];
-#endif /* SUPPORTED_PERSONALITIES >= 2 */
-
-#if SUPPORTED_PERSONALITIES >= 3
-const char *const signalent2[] = {
-#include "signalent2.h"
-};
-const int nsignals2 = sizeof signalent2 / sizeof signalent2[0];
-#endif /* SUPPORTED_PERSONALITIES >= 3 */
-
-const char *const *signalent;
-int nsignals;
-
-#if defined(SUNOS4) || defined(FREEBSD)
-
-static const struct xlat sigvec_flags[] = {
- { SV_ONSTACK, "SV_ONSTACK" },
- { SV_INTERRUPT, "SV_INTERRUPT" },
- { SV_RESETHAND, "SV_RESETHAND" },
- { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
- { 0, NULL },
-};
-
-#endif /* SUNOS4 || FREEBSD */
#ifdef HAVE_SIGACTION
-#if defined LINUX && (defined I386 || defined X86_64)
+#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 wwe define it here. */
+ used by the implementation. So we define it here. */
# ifndef SA_RESTORER
# define SA_RESTORER 0x04000000
# endif
#ifdef SA_INTERRUPT
{ SA_INTERRUPT, "SA_INTERRUPT" },
#endif
-#ifdef SA_NOMASK
+#ifdef SA_NODEFER
+ { SA_NODEFER, "SA_NODEFER" },
+#endif
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
{ SA_NOMASK, "SA_NOMASK" },
#endif
-#ifdef SA_ONESHOT
+#ifdef SA_RESETHAND
+ { SA_RESETHAND, "SA_RESETHAND" },
+#endif
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
{ SA_ONESHOT, "SA_ONESHOT" },
#endif
#ifdef SA_SIGINFO
#endif
#ifdef _SA_BSDCALL
{ _SA_BSDCALL, "_SA_BSDCALL" },
+#endif
+#ifdef SA_NOPTRACE
+ { SA_NOPTRACE, "SA_NOPTRACE" },
#endif
{ 0, NULL },
};
#endif
#endif
+/* Note on the size of sigset_t:
+ *
+ * In glibc, sigset_t is an array with space for 1024 bits (!),
+ * even though all arches supported by Linux have only 64 signals
+ * except MIPS, which has 128. IOW, it is 128 bytes long.
+ *
+ * In-kernel sigset_t is sized correctly (it is either 64 or 128 bit long).
+ * However, some old syscall return only 32 lower bits (one word).
+ * Example: sys_sigpending vs sys_rt_sigpending.
+ *
+ * Be aware of this fact when you try to
+ * memcpy(&tcp->u_arg[1], &something, sizeof(sigset_t))
+ * - sizeof(sigset_t) is much bigger than you think,
+ * it may overflow tcp->u_arg[] array, and it may try to copy more data
+ * than is really available in <something>.
+ * Similarly,
+ * 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.
+ */
+
const char *
-signame(sig)
-int sig;
+signame(int sig)
{
- static char buf[30];
- if (sig >= 0 && sig < nsignals) {
+ static char buf[sizeof("SIGRT_%d") + sizeof(int)*3];
+
+ if (sig >= 0 && sig < nsignals)
return signalent[sig];
#ifdef SIGRTMIN
- } else if (sig >= __SIGRTMIN && sig <= __SIGRTMAX) {
- sprintf(buf, "SIGRT_%ld", (long)(sig - __SIGRTMIN));
- return buf;
-#endif /* SIGRTMIN */
- } else {
- sprintf(buf, "%d", sig);
+ if (sig >= __SIGRTMIN && sig <= __SIGRTMAX) {
+ sprintf(buf, "SIGRT_%d", (int)(sig - __SIGRTMIN));
return buf;
}
+#endif
+ sprintf(buf, "%d", sig);
+ return buf;
}
-#ifndef UNIXWARE
static void
-long_to_sigset(l, s)
-long l;
-sigset_t *s;
+long_to_sigset(long l, sigset_t *s)
{
sigemptyset(s);
*(long *)s = l;
}
-#endif
static int
-copy_sigset_len(tcp, addr, s, len)
-struct tcb *tcp;
-long addr;
-sigset_t *s;
-int len;
+copy_sigset_len(struct tcb *tcp, long addr, sigset_t *s, int len)
{
if (len > sizeof(*s))
len = sizeof(*s);
return 0;
}
-#ifdef LINUX
/* Original sigset is unsigned long */
#define copy_sigset(tcp, addr, s) copy_sigset_len(tcp, addr, s, sizeof(long))
-#else
-#define copy_sigset(tcp, addr, s) copy_sigset_len(tcp, addr, s, sizeof(sigset_t))
-#endif
static const char *
sprintsigmask(const char *str, sigset_t *mask, int rt)
/* set might include realtime sigs */
{
+ /* 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
+ */
+ static char outstr[8 * (255 * 2 / 3)];
+
int i, nsigs;
int maxsigs;
- char *format, *s;
- static char outstr[8 * sizeof(sigset_t) * 8];
+ int show_members;
+ char sep;
+ char *s;
- strcpy(outstr, str);
- s = outstr + strlen(outstr);
- nsigs = 0;
maxsigs = nsignals;
#ifdef __SIGRTMAX
if (rt)
maxsigs = __SIGRTMAX; /* instead */
#endif
+ s = stpcpy(outstr, str);
+ nsigs = 0;
for (i = 1; i < maxsigs; i++) {
if (sigismember(mask, i) == 1)
nsigs++;
}
- if (nsigs >= nsignals * 2 / 3) {
+
+ /* 1: show mask members, 0: show those which are NOT in mask */
+ show_members = (nsigs < nsignals * 2 / 3);
+ if (!show_members)
*s++ = '~';
- for (i = 1; i < maxsigs; i++) {
- switch (sigismember(mask, i)) {
- case 1:
- sigdelset(mask, i);
- break;
- case 0:
- sigaddset(mask, i);
- break;
- }
- }
- }
- format = "%s";
- *s++ = '[';
+
+ sep = '[';
for (i = 1; i < maxsigs; i++) {
- if (sigismember(mask, i) == 1) {
+ if (sigismember(mask, i) == show_members) {
/* real-time signals on solaris don't have
* signalent entries
*/
+ char tsig[40];
+ *s++ = sep;
if (i < nsignals) {
- sprintf(s, format, signalent[i] + 3);
+ s = stpcpy(s, signalent[i] + 3);
}
#ifdef SIGRTMIN
else if (i >= __SIGRTMIN && i <= __SIGRTMAX) {
- char tsig[40];
sprintf(tsig, "RT_%u", i - __SIGRTMIN);
- sprintf(s, format, tsig);
+ s = stpcpy(s, tsig);
}
#endif /* SIGRTMIN */
else {
- char tsig[32];
sprintf(tsig, "%u", i);
- sprintf(s, format, tsig);
+ s = stpcpy(s, tsig);
}
- s += strlen(s);
- format = " %s";
+ sep = ' ';
}
}
+ if (sep == '[')
+ *s++ = sep;
*s++ = ']';
*s = '\0';
return outstr;
}
static void
-printsigmask(mask, rt)
-sigset_t *mask;
-int rt;
+printsigmask(sigset_t *mask, int rt)
{
- tprintf("%s", sprintsigmask("", mask, rt));
+ tprints(sprintsigmask("", mask, rt));
}
void
-printsignal(nr)
-int nr;
+printsignal(int nr)
{
- tprintf(signame(nr));
+ tprints(signame(nr));
}
void
sigset_t ss;
if (!addr)
- tprintf("NULL");
+ tprints("NULL");
else if (copy_sigset(tcp, addr, &ss) < 0)
tprintf("%#lx", addr);
else
printsigmask(&ss, rt);
}
-#ifdef LINUX
-
#ifndef ILL_ILLOPC
#define ILL_ILLOPC 1 /* illegal opcode */
#define ILL_ILLOPN 2 /* illegal operand */
#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 */
-#endif
-
-#if __GLIBC_MINOR__ < 1
-/* Type for data associated with a signal. */
-typedef union sigval
-{
- int sival_int;
- void *sival_ptr;
-} sigval_t;
-
-# define __SI_MAX_SIZE 128
-# define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
-
-typedef struct siginfo
-{
- int si_signo; /* Signal number. */
- int si_errno; /* If non-zero, an errno value associated with
- this signal, as defined in <errno.h>. */
- int si_code; /* Signal code. */
-
- union
- {
- int _pad[__SI_PAD_SIZE];
-
- /* kill(). */
- struct
- {
- __pid_t si_pid; /* Sending process ID. */
- __uid_t si_uid; /* Real user ID of sending process. */
- } _kill;
-
- /* POSIX.1b timers. */
- struct
- {
- unsigned int _timer1;
- unsigned int _timer2;
- } _timer;
-
- /* POSIX.1b signals. */
- struct
- {
- __pid_t si_pid; /* Sending process ID. */
- __uid_t si_uid; /* Real user ID of sending process. */
- sigval_t si_sigval; /* Signal value. */
- } _rt;
-
- /* SIGCHLD. */
- struct
- {
- __pid_t si_pid; /* Which child. */
- int si_status; /* Exit value or signal. */
- __clock_t si_utime;
- __clock_t si_stime;
- } _sigchld;
-
- /* SIGILL, SIGFPE, SIGSEGV, SIGBUS. */
- struct
- {
- void *si_addr; /* Faulting insn/memory ref. */
- } _sigfault;
-
- /* SIGPOLL. */
- struct
- {
- int si_band; /* Band event for SIGPOLL. */
- int si_fd;
- } _sigpoll;
- } _sifields;
-} siginfo_t;
-
-#define si_pid _sifields._kill.si_pid
-#define si_uid _sifields._kill.si_uid
-#define si_status _sifields._sigchld.si_status
-#define si_utime _sifields._sigchld.si_utime
-#define si_stime _sifields._sigchld.si_stime
-#define si_value _sifields._rt.si_sigval
-#define si_int _sifields._rt.si_sigval.sival_int
-#define si_ptr _sifields._rt.si_sigval.sival_ptr
-#define si_addr _sifields._sigfault.si_addr
-#define si_band _sifields._sigpoll.si_band
-#define si_fd _sifields._sigpoll.si_fd
-
+#define SI_SIGIO -5 /* sent by SIGIO */
+#define SI_TKILL -6 /* sent by tkill */
+#define SI_ASYNCNL -60 /* sent by asynch name lookup completion */
#endif
+#ifndef SI_FROMUSER
+# define SI_FROMUSER(sip) ((sip)->si_code <= 0)
#endif
-#if defined (SVR4) || defined (LINUX)
-
static const struct xlat siginfo_codes[] = {
-#ifdef SI_NOINFO
- { SI_NOINFO, "SI_NOINFO" },
+#ifdef SI_KERNEL
+ { SI_KERNEL, "SI_KERNEL" },
#endif
#ifdef SI_USER
{ SI_USER, "SI_USER" },
#endif
-#ifdef SI_LWP
- { SI_LWP, "SI_LWP" },
-#endif
#ifdef SI_QUEUE
{ SI_QUEUE, "SI_QUEUE" },
#endif
#ifdef SI_TIMER
{ SI_TIMER, "SI_TIMER" },
#endif
-#ifdef SI_ASYNCIO
- { SI_ASYNCIO, "SI_ASYNCIO" },
-#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 },
};
};
void
-printsiginfo(sip, verbose)
-siginfo_t *sip;
-int verbose;
+printsiginfo(siginfo_t *sip, int verbose)
{
const char *code;
if (sip->si_signo == 0) {
- tprintf ("{}");
+ tprints("{}");
return;
}
- tprintf("{si_signo=");
+ tprints("{si_signo=");
printsignal(sip->si_signo);
code = xlookup(siginfo_codes, sip->si_code);
if (!code) {
}
#ifdef SI_FROMUSER
if (SI_FROMUSER(sip)) {
- tprintf(", si_pid=%ld, si_uid=%ld",
- sip->si_pid, sip->si_uid);
-#ifdef SI_QUEUE
+ tprintf(", si_pid=%lu, si_uid=%lu",
+ (unsigned long) sip->si_pid,
+ (unsigned long) sip->si_uid);
switch (sip->si_code) {
- case SI_QUEUE:
+#ifdef SI_USER
+ case SI_USER:
+ break;
+#endif
+#ifdef SI_TKILL
+ case SI_TKILL:
+ break;
+#endif
#ifdef SI_TIMER
case SI_TIMER:
-#endif /* SI_QUEUE */
- case SI_ASYNCIO:
-#ifdef SI_MESGQ
- case SI_MESGQ:
-#endif /* SI_MESGQ */
- tprintf(", si_value=%d",
- sip->si_value.sival_int);
+ tprintf(", si_value=%d", sip->si_int);
+ 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);
break;
}
-#endif /* SI_QUEUE */
}
else
#endif /* SI_FROMUSER */
tprintf("%d", sip->si_status);
else
printsignal(sip->si_status);
-#if LINUX
if (!verbose)
- tprintf(", ...");
+ tprints(", ...");
else
- tprintf(", si_utime=%lu, si_stime=%lu",
- sip->si_utime,
- sip->si_stime);
-#endif
+ 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:
break;
}
break;
-#ifdef LINUX
default:
- tprintf(", si_pid=%lu, si_uid=%lu, ",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
+ 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)
- tprintf("...");
+ tprints(", ...");
else {
- tprintf("si_value={int=%u, ptr=%#lx}",
+ tprintf(", si_value={int=%u, ptr=%#lx}",
sip->si_int,
(unsigned long) sip->si_ptr);
}
-#endif
}
}
}
- tprintf("}");
+ tprints("}");
}
-#endif /* SVR4 || LINUX */
-
-#ifdef LINUX
-
-static void
-parse_sigset_t (const char *str, sigset_t *set)
-{
- const char *p;
- unsigned int digit;
- int i;
-
- sigemptyset(set);
-
- p = strchr(str, '\n');
- if (p == NULL)
- p = strchr(str, '\0');
- for (i = 0; p-- > str; i += 4) {
- if (*p >= '0' && *p <= '9')
- digit = *p - '0';
- else if (*p >= 'a' && *p <= 'f')
- digit = *p - 'a' + 10;
- else if (*p >= 'A' && *p <= 'F')
- digit = *p - 'A' + 10;
- else
- break;
- if (digit & 1)
- sigaddset(set, i + 1);
- if (digit & 2)
- sigaddset(set, i + 2);
- if (digit & 4)
- sigaddset(set, i + 3);
- if (digit & 8)
- sigaddset(set, i + 4);
- }
-}
-
-#endif
-
-/*
- * Check process TCP for the disposition of signal SIG.
- * Return 1 if the process would somehow manage to survive signal SIG,
- * else return 0. This routine will never be called with SIGKILL.
- */
-int
-sigishandled(tcp, sig)
-struct tcb *tcp;
-int sig;
-{
-#ifdef LINUX
- int sfd;
- char sname[32];
- char buf[2048];
- char *s;
- int i;
- sigset_t ignored, caught;
-#endif
-#ifdef SVR4
- /*
- * Since procfs doesn't interfere with wait I think it is safe
- * to punt on this question. If not, the information is there.
- */
- return 1;
-#else /* !SVR4 */
- switch (sig) {
- case SIGCONT:
- case SIGSTOP:
- case SIGTSTP:
- case SIGTTIN:
- case SIGTTOU:
- case SIGCHLD:
- case SIGIO:
-#if defined(SIGURG) && SIGURG != SIGIO
- case SIGURG:
-#endif
- case SIGWINCH:
- /* Gloria Gaynor says ... */
- return 1;
- default:
- break;
- }
-#endif /* !SVR4 */
-#ifdef LINUX
-
- /* This is incredibly costly but it's worth it. */
- /* NOTE: LinuxThreads internally uses SIGRTMIN, SIGRTMIN + 1 and
- SIGRTMIN + 2, so we can't use the obsolete /proc/%d/stat which
- doesn't handle real-time signals). */
- sprintf(sname, "/proc/%d/status", tcp->pid);
- if ((sfd = open(sname, O_RDONLY)) == -1) {
- perror(sname);
- return 1;
- }
- i = read(sfd, buf, sizeof(buf));
- buf[i] = '\0';
- close(sfd);
- /*
- * Skip the extraneous fields. We need to skip
- * command name has any spaces in it. So be it.
- */
- s = strstr(buf, "SigIgn:\t");
- if (!s)
- {
- fprintf(stderr, "/proc/pid/status format error\n");
- return 1;
- }
- parse_sigset_t(s + 8, &ignored);
-
- s = strstr(buf, "SigCgt:\t");
- if (!s)
- {
- fprintf(stderr, "/proc/pid/status format error\n");
- return 1;
- }
- parse_sigset_t(s + 8, &caught);
-
-#ifdef DEBUG
- fprintf(stderr, "sigs: %016qx %016qx (sig=%d)\n",
- *(long long *) &ignored, *(long long *) &caught, sig);
-#endif
- if (sigismember(&ignored, sig) || sigismember(&caught, sig))
- return 1;
-#endif /* LINUX */
-
-#ifdef SUNOS4
- void (*u_signal)();
-
- if (upeek(tcp->pid, uoff(u_signal[0]) + sig*sizeof(u_signal),
- (long *) &u_signal) < 0) {
- return 0;
- }
- if (u_signal != SIG_DFL)
- return 1;
-#endif /* SUNOS4 */
-
- return 0;
-}
-
-#if defined(SUNOS4) || defined(FREEBSD)
-
-int
-sys_sigvec(tcp)
-struct tcb *tcp;
+void
+printsiginfo_at(struct tcb *tcp, long addr)
{
- struct sigvec sv;
- long addr;
-
- if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
- tprintf(", ");
- addr = tcp->u_arg[1];
- } else {
- addr = tcp->u_arg[2];
+ siginfo_t si;
+ if (!addr) {
+ tprints("NULL");
+ return;
}
- if (addr == 0)
- tprintf("NULL");
- else if (!verbose(tcp))
+ if (syserror(tcp)) {
tprintf("%#lx", addr);
- else if (umove(tcp, addr, &sv) < 0)
- tprintf("{...}");
- else {
- switch ((int) sv.sv_handler) {
- case (int) SIG_ERR:
- tprintf("{SIG_ERR}");
- break;
- case (int) SIG_DFL:
- tprintf("{SIG_DFL}");
- break;
- case (int) SIG_IGN:
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
- tprintf("{SIG_IGN}");
- break;
- case (int) SIG_HOLD:
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
- tprintf("SIG_HOLD");
- break;
- default:
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
- tprintf("{%#lx, ", (unsigned long) sv.sv_handler);
- printsigmask(&sv.sv_mask, 0);
- tprintf(", ");
- printflags(sigvec_flags, sv.sv_flags, "SV_???");
- tprintf("}");
- }
- }
- if (entering(tcp))
- tprintf(", ");
- return 0;
-}
-
-int
-sys_sigpause(tcp)
-struct tcb *tcp;
-{
- if (entering(tcp)) { /* WTA: UD had a bug here: he forgot the braces */
- sigset_t sigm;
- long_to_sigset(tcp->u_arg[0], &sigm);
- printsigmask(&sigm, 0);
+ return;
}
- return 0;
-}
-
-int
-sys_sigstack(tcp)
-struct tcb *tcp;
-{
- struct sigstack ss;
- long addr;
-
- if (entering(tcp))
- addr = tcp->u_arg[0];
- else
- addr = tcp->u_arg[1];
- if (addr == 0)
- tprintf("NULL");
- else if (umove(tcp, addr, &ss) < 0)
- tprintf("%#lx", addr);
- else {
- tprintf("{ss_sp %#lx ", (unsigned long) ss.ss_sp);
- tprintf("ss_onstack %s}", ss.ss_onstack ? "YES" : "NO");
+ if (umove(tcp, addr, &si) < 0) {
+ tprints("{???}");
+ return;
}
- if (entering(tcp))
- tprintf(", ");
- return 0;
+ printsiginfo(&si, verbose(tcp));
}
int
-sys_sigcleanup(tcp)
-struct tcb *tcp;
-{
- return 0;
-}
-
-#endif /* SUNOS4 || FREEBSD */
-
-#ifndef SVR4
-
-int
-sys_sigsetmask(tcp)
-struct tcb *tcp;
+sys_sigsetmask(struct tcb *tcp)
{
if (entering(tcp)) {
sigset_t sigm;
long_to_sigset(tcp->u_arg[0], &sigm);
printsigmask(&sigm, 0);
-#ifndef USE_PROCFS
- if ((tcp->u_arg[0] & sigmask(SIGTRAP))) {
- /* Mark attempt to block SIGTRAP */
- tcp->flags |= TCB_SIGTRAPPED;
- /* Send unblockable signal */
- kill(tcp->pid, SIGSTOP);
- }
-#endif /* !USE_PROCFS */
}
else if (!syserror(tcp)) {
sigset_t sigm;
return 0;
}
-#if defined(SUNOS4) || defined(FREEBSD)
-int
-sys_sigblock(tcp)
-struct tcb *tcp;
-{
- return sys_sigsetmask(tcp);
-}
-#endif /* SUNOS4 || FREEBSD */
-
-#endif /* !SVR4 */
-
#ifdef HAVE_SIGACTION
-#ifdef LINUX
struct old_sigaction {
- __sighandler_t __sa_handler;
+ /* sa_handler may be a libc #define, need to use other name: */
+ void (*__sa_handler)(int);
unsigned long sa_mask;
unsigned long sa_flags;
void (*sa_restorer)(void);
};
-#define SA_HANDLER __sa_handler
-#endif /* LINUX */
-
-#ifndef SA_HANDLER
-#define SA_HANDLER sa_handler
-#endif
int
-sys_sigaction(tcp)
-struct tcb *tcp;
+sys_sigaction(struct tcb *tcp)
{
long addr;
-#ifdef LINUX
sigset_t sigset;
struct old_sigaction sa;
-#else
- struct sigaction sa;
-#endif
-
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
addr = tcp->u_arg[1];
} else
addr = tcp->u_arg[2];
if (addr == 0)
- tprintf("NULL");
+ tprints("NULL");
else if (!verbose(tcp))
tprintf("%#lx", addr);
else if (umove(tcp, addr, &sa) < 0)
- tprintf("{...}");
+ tprints("{...}");
else {
- switch ((long) sa.SA_HANDLER) {
- case (long) SIG_ERR:
- tprintf("{SIG_ERR}");
- break;
- case (long) SIG_DFL:
- tprintf("{SIG_DFL}");
- break;
- case (long) SIG_IGN:
-#ifndef USE_PROCFS
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
-#endif /* !USE_PROCFS */
- tprintf("{SIG_IGN}");
- break;
- default:
-#ifndef USE_PROCFS
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
-#endif /* !USE_PROCFS */
- tprintf("{%#lx, ", (long) sa.SA_HANDLER);
-#ifndef LINUX
- printsigmask (&sa.sa_mask, 0);
-#else
- long_to_sigset(sa.sa_mask, &sigset);
- printsigmask(&sigset, 0);
-#endif
- tprintf(", ");
- printflags(sigact_flags, sa.sa_flags, "SA_???");
+ /* 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_???");
#ifdef SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
+ if (sa.sa_flags & SA_RESTORER)
+ tprintf(", %p", sa.sa_restorer);
#endif
- tprintf("}");
- }
+ tprints("}");
}
if (entering(tcp))
- tprintf(", ");
-#ifdef LINUX
+ tprints(", ");
else
tprintf(", %#lx", (unsigned long) sa.sa_restorer);
-#endif
return 0;
}
int
-sys_signal(tcp)
-struct tcb *tcp;
+sys_signal(struct tcb *tcp)
{
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
switch (tcp->u_arg[1]) {
- case (int) SIG_ERR:
- tprintf("SIG_ERR");
+ case (long) SIG_ERR:
+ tprints("SIG_ERR");
break;
- case (int) SIG_DFL:
- tprintf("SIG_DFL");
+ case (long) SIG_DFL:
+ tprints("SIG_DFL");
break;
- case (int) SIG_IGN:
-#ifndef USE_PROCFS
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
-#endif /* !USE_PROCFS */
- tprintf("SIG_IGN");
+ case (long) SIG_IGN:
+ tprints("SIG_IGN");
break;
default:
-#ifndef USE_PROCFS
- if (tcp->u_arg[0] == SIGTRAP) {
- tcp->flags |= TCB_SIGTRAPPED;
- kill(tcp->pid, SIGSTOP);
- }
-#endif /* !USE_PROCFS */
tprintf("%#lx", tcp->u_arg[1]);
}
return 0;
}
- else {
+ else if (!syserror(tcp)) {
switch (tcp->u_rval) {
- case (int) SIG_ERR:
+ case (long) SIG_ERR:
tcp->auxstr = "SIG_ERR"; break;
- case (int) SIG_DFL:
+ case (long) SIG_DFL:
tcp->auxstr = "SIG_DFL"; break;
- case (int) SIG_IGN:
+ case (long) SIG_IGN:
tcp->auxstr = "SIG_IGN"; break;
- default:
+ default:
tcp->auxstr = NULL;
}
return RVAL_HEX | RVAL_STR;
}
-}
-
-#ifdef SVR4
-int
-sys_sighold(tcp)
-struct tcb *tcp;
-{
- if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
- }
return 0;
}
-#endif /* SVR4 */
#endif /* HAVE_SIGACTION */
-#ifdef LINUX
-
int
-sys_sigreturn(tcp)
-struct tcb *tcp;
+sys_sigreturn(struct tcb *tcp)
{
-#ifdef ARM
- struct pt_regs regs;
- struct sigcontext_struct sc;
-
+#if defined(ARM)
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
-
- if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (void *)®s) == -1)
- return 0;
-
- if (umove(tcp, regs.ARM_sp, &sc) < 0)
- return 0;
-
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = sc.oldmask;
- } else {
+ struct sigcontext_struct sc;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ if (umove(tcp, arm_regs.ARM_sp, &sc) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ long_to_sigset(sc.oldmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
#elif defined(S390) || defined(S390X)
- long usp;
- struct sigcontext_struct sc;
-
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid,PT_GPR15,&usp)<0)
- return 0;
- if (umove(tcp, usp+__SIGNAL_FRAMESIZE, &sc) < 0)
+ long usp;
+ struct sigcontext_struct sc;
+ if (upeek(tcp, PT_GPR15, &usp) < 0)
return 0;
- tcp->u_arg[0] = 1;
- memcpy(&tcp->u_arg[1],&sc.oldmask[0],sizeof(sigset_t));
- } else {
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ if (umove(tcp, usp + __SIGNAL_FRAMESIZE, &sc) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ",(sigset_t *)&tcp->u_arg[1],0);
- return RVAL_NONE | RVAL_STR;
+ tprints(sprintsigmask(") (mask ", (sigset_t *)&sc.oldmask[0], 0));
}
- return 0;
-#else
-#ifdef I386
- long esp;
- struct sigcontext_struct sc;
-
+#elif defined(I386)
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid, 4*UESP, &esp) < 0)
- return 0;
- if (umove(tcp, esp, &sc) < 0)
- return 0;
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = sc.oldmask;
- }
- else {
+ struct sigcontext_struct sc;
+ /* Note: 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. We can fetch it there
+ * if/when we'd want to display the full mask...
+ */
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ if (umove(tcp, i386_regs.esp, &sc) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ long_to_sigset(sc.oldmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
-#else /* !I386 */
-#ifdef IA64
- struct sigcontext sc;
- long sp;
-
+#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
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid, PT_R12, &sp) < 0)
+ if (upeek(tcp, PT_R12, &sp) < 0)
return 0;
if (umove(tcp, sp + 16 + SIGFRAME_SC_OFFSET, &sc) < 0)
return 0;
- tcp->u_arg[0] = 1;
- memcpy(tcp->u_arg + 1, &sc.sc_mask, sizeof(sc.sc_mask));
- }
- else {
- sigset_t sigm;
-
- memcpy(&sigm, tcp->u_arg + 1, sizeof (sigm));
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
- return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ sigemptyset(&sigm);
+ memcpy(&sigm, &sc.sc_mask, NSIG / 8);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
-#else /* !IA64 */
-#ifdef POWERPC
- long esp;
- struct sigcontext_struct sc;
-
+#elif defined(POWERPC)
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid, sizeof(unsigned long)*PT_R1, &esp) < 0)
+ long esp;
+ struct sigcontext_struct sc;
+ sigset_t sigm;
+ if (upeek(tcp, sizeof(unsigned long) * PT_R1, &esp) < 0)
return 0;
+ /* Skip dummy stack frame. */
+#ifdef POWERPC64
+ if (current_personality == 0)
+ esp += 128;
+ else
+ esp += 64;
+#else
+ esp += 64;
+#endif
if (umove(tcp, esp, &sc) < 0)
return 0;
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = sc.oldmask;
+ long_to_sigset(sc.oldmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- else {
+#elif defined(M68K)
+ if (entering(tcp)) {
+ long usp;
+ struct sigcontext sc;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ if (upeek(tcp, 4*PT_USP, &usp) < 0)
+ return 0;
+ if (umove(tcp, usp, &sc) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ long_to_sigset(sc.sc_mask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
-#else /* !POWERPC */
-#ifdef M68K
- long usp;
- struct sigcontext sc;
-
+#elif defined(ALPHA)
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid, 4*PT_USP, &usp) < 0)
+ long fp;
+ struct sigcontext_struct sc;
+ sigset_t sigm;
+ if (upeek(tcp, REG_FP, &fp) < 0)
return 0;
- if (umove(tcp, usp, &sc) < 0)
+ if (umove(tcp, fp, &sc) < 0)
return 0;
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = sc.sc_mask;
+ long_to_sigset(sc.sc_mask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- else {
+#elif defined(SPARC) || defined(SPARC64)
+ if (entering(tcp)) {
+ long i1;
+ m_siginfo_t si;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ i1 = sparc_regs.u_regs[U_REG_O1];
+ if (umove(tcp, i1, &si) < 0) {
+ perror_msg("sigreturn: umove");
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ }
+ long_to_sigset(si.si_mask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
-#else /* !M68K */
-#ifdef ALPHA
- long fp;
- struct sigcontext_struct sc;
-
+#elif defined(LINUX_MIPSN32) || defined(LINUX_MIPSN64)
+ /* This decodes rt_sigreturn. The 64-bit ABIs do not have
+ sigreturn. */
if (entering(tcp)) {
- tcp->u_arg[0] = 0;
- if (upeek(tcp->pid, REG_FP, &fp) < 0)
+ long sp;
+ struct ucontext uc;
+ sigset_t sigm;
+ if (upeek(tcp, REG_SP, &sp) < 0)
return 0;
- if (umove(tcp, fp, &sc) < 0)
+ /* There are six words followed by a 128-byte siginfo. */
+ sp = sp + 6 * 4 + 128;
+ if (umove(tcp, sp, &uc) < 0)
return 0;
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = sc.sc_mask;
+ long_to_sigset(*(long *) &uc.uc_sigmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- else {
+#elif defined(MIPS)
+ if (entering(tcp)) {
+ long sp;
+ struct pt_regs regs;
+ m_siginfo_t si;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
+ if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
+ perror_msg("sigreturn: PTRACE_GETREGS");
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
- }
- return 0;
-#else
-#if defined (SPARC) || defined (SPARC64)
- long i1;
- struct regs regs;
- m_siginfo_t si;
-
- if(ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
- perror("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));
}
- if(entering(tcp)) {
- tcp->u_arg[0] = 0;
- i1 = regs.r_o1;
- if(umove(tcp, i1, &si) < 0) {
- perror("sigreturn: umove ");
+#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;
}
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = si.si_mask;
- } else {
- sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if(tcp->u_arg[0] == 0)
+ if (umove(tcp, regs[PT_USP], &sc) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ long_to_sigset(sc.oldmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
-#else
-#if defined (LINUX_MIPSN32) || defined (LINUX_MIPSN64)
- /* This decodes rt_sigreturn. The 64-bit ABIs do not have
- sigreturn. */
- long sp;
- struct ucontext uc;
-
- if(entering(tcp)) {
- tcp->u_arg[0] = 0;
- 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;
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = *(long *) &uc.uc_sigmask;
- } else {
+#elif defined(TILE)
+ if (entering(tcp)) {
+ struct ucontext uc;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if(tcp->u_arg[0] == 0)
- return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
- }
- return 0;
-#else
-#ifdef MIPS
- long sp;
- struct pt_regs regs;
- m_siginfo_t si;
- if(ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
- perror("sigreturn: PTRACE_GETREGS ");
- return 0;
+ /* offset of ucontext in the kernel's sigframe structure */
+# define SIGFRAME_UC_OFFSET C_ABI_SAVE_AREA_SIZE + sizeof(struct siginfo)
+ 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));
}
- if(entering(tcp)) {
- tcp->u_arg[0] = 0;
- sp = regs.regs[29];
- if (umove(tcp, sp, &si) < 0)
- tcp->u_arg[0] = 1;
- tcp->u_arg[1] = si.si_mask;
- } else {
+#elif defined(MICROBLAZE)
+ /* TODO: Verify that this is correct... */
+ if (entering(tcp)) {
+ struct sigcontext sc;
+ long sp;
sigset_t sigm;
- long_to_sigset(tcp->u_arg[1], &sigm);
- tcp->u_rval = tcp->u_error = 0;
- if(tcp->u_arg[0] == 0)
+ /* Read r1, the stack pointer. */
+ if (upeek(tcp, 1 * 4, &sp) < 0)
return 0;
- tcp->auxstr = sprintsigmask("mask now ", &sigm, 0);
- return RVAL_NONE | RVAL_STR;
+ if (umove(tcp, sp, &sc) < 0)
+ return 0;
+ long_to_sigset(sc.oldmask, &sigm);
+ tprints(sprintsigmask(") (mask ", &sigm, 0));
}
- return 0;
+#elif defined(X86_64)
+ /* no need to remind */
+#elif defined(XTENSA)
+ /* Xtensa only has rt_sys_sigreturn */
#else
-#warning No sys_sigreturn() for this architecture
-#warning (no problem, just a reminder :-)
+# warning No sys_sigreturn() for this architecture
+# warning (no problem, just a reminder :-)
+#endif
return 0;
-#endif /* MIPS */
-#endif /* LINUX_MIPSN32 || LINUX_MIPSN64 */
-#endif /* SPARC || SPARC64 */
-#endif /* ALPHA */
-#endif /* !M68K */
-#endif /* !POWERPC */
-#endif /* !IA64 */
-#endif /* !I386 */
-#endif /* S390 */
}
int
-sys_siggetmask(tcp)
-struct tcb *tcp;
+sys_siggetmask(struct tcb *tcp)
{
if (exiting(tcp)) {
sigset_t sigm;
}
int
-sys_sigsuspend(tcp)
-struct tcb *tcp;
+sys_sigsuspend(struct tcb *tcp)
{
if (entering(tcp)) {
sigset_t sigm;
long_to_sigset(tcp->u_arg[2], &sigm);
-#if 0
- /* first two are not really arguments, but print them anyway */
- /* nevermind, they are an anachronism now, too bad... */
- tprintf("%d, %#x, ", tcp->u_arg[0], tcp->u_arg[1]);
-#endif
printsigmask(&sigm, 0);
}
return 0;
}
-#endif /* LINUX */
-
-#if defined(SVR4) || defined(FREEBSD)
-
-int
-sys_sigsuspend(tcp)
-struct tcb *tcp;
-{
- sigset_t sigset;
-
- if (entering(tcp)) {
- if (umove(tcp, tcp->u_arg[0], &sigset) < 0)
- tprintf("[?]");
- else
- printsigmask(&sigset, 0);
- }
- return 0;
-}
-#ifndef FREEBSD
-static const struct xlat ucontext_flags[] = {
- { UC_SIGMASK, "UC_SIGMASK" },
- { UC_STACK, "UC_STACK" },
- { UC_CPU, "UC_CPU" },
-#ifdef UC_FPU
- { UC_FPU, "UC_FPU" },
-#endif
-#ifdef UC_INTR
- { UC_INTR, "UC_INTR" },
-#endif
- { 0, NULL },
-};
-#endif /* !FREEBSD */
-#endif /* SVR4 || FREEBSD */
-
-#if defined SVR4 || defined LINUX || defined FREEBSD
-#if defined LINUX && !defined SS_ONSTACK
+#if !defined SS_ONSTACK
#define SS_ONSTACK 1
#define SS_DISABLE 2
-#if __GLIBC_MINOR__ == 0
-typedef struct
-{
- __ptr_t ss_sp;
- int ss_flags;
- size_t ss_size;
-} stack_t;
-#endif
-#endif
-#ifdef FREEBSD
-#define stack_t struct sigaltstack
#endif
static const struct xlat sigaltstack_flags[] = {
{ SS_DISABLE, "SS_DISABLE" },
{ 0, NULL },
};
-#endif
-#ifdef SVR4
static void
-printcontext(tcp, ucp)
-struct tcb *tcp;
-ucontext_t *ucp;
+print_stack_t(struct tcb *tcp, unsigned long addr)
{
- tprintf("{");
- if (!abbrev(tcp)) {
- tprintf("uc_flags=");
- printflags(ucontext_flags, ucp->uc_flags, "UC_???");
- tprintf(", uc_link=%#lx, ", (unsigned long) ucp->uc_link);
- }
- tprintf("uc_sigmask=");
- printsigmask(&ucp->uc_sigmask, 0);
- if (!abbrev(tcp)) {
- tprintf(", uc_stack={ss_sp=%#lx, ss_size=%d, ss_flags=",
- (unsigned long) ucp->uc_stack.ss_sp,
- ucp->uc_stack.ss_size);
- printflags(sigaltstack_flags, ucp->uc_stack.ss_flags, "SS_???");
- tprintf("}");
- }
- tprintf(", ...}");
-}
-
-int
-sys_getcontext(tcp)
-struct tcb *tcp;
-{
- ucontext_t uc;
+ stack_t ss;
- if (exiting(tcp)) {
- if (tcp->u_error)
- tprintf("%#lx", tcp->u_arg[0]);
- else if (!tcp->u_arg[0])
- tprintf("NULL");
- else if (umove(tcp, tcp->u_arg[0], &uc) < 0)
- tprintf("{...}");
- else
- printcontext(tcp, &uc);
+ if (!addr) {
+ tprints("NULL");
+ } else if (umove(tcp, addr, &ss) < 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 0;
}
int
-sys_setcontext(tcp)
-struct tcb *tcp;
+sys_sigaltstack(struct tcb *tcp)
{
- ucontext_t uc;
-
if (entering(tcp)) {
- if (!tcp->u_arg[0])
- tprintf("NULL");
- else if (umove(tcp, tcp->u_arg[0], &uc) < 0)
- tprintf("{...}");
- else
- printcontext(tcp, &uc);
+ print_stack_t(tcp, tcp->u_arg[0]);
}
else {
- tcp->u_rval = tcp->u_error = 0;
- if (tcp->u_arg[0] == 0)
- return 0;
- return RVAL_NONE;
+ tprints(", ");
+ print_stack_t(tcp, tcp->u_arg[1]);
}
return 0;
}
-#endif /* SVR4 */
-
-#if defined(LINUX) || defined(FREEBSD)
-
-static int
-print_stack_t(tcp, addr)
-struct tcb *tcp;
-unsigned long addr;
-{
- stack_t ss;
- if (umove(tcp, addr, &ss) < 0)
- return -1;
- 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 0;
-}
-
-int
-sys_sigaltstack(tcp)
- struct tcb *tcp;
-{
- if (entering(tcp)) {
- if (tcp->u_arg[0] == 0)
- tprintf("NULL");
- else if (print_stack_t(tcp, tcp->u_arg[0]) < 0)
- return -1;
- }
- else {
- tprintf(", ");
- if (tcp->u_arg[1] == 0)
- tprintf("NULL");
- else if (print_stack_t(tcp, tcp->u_arg[1]) < 0)
- return -1;
- }
- return 0;
-}
-#endif
-
#ifdef HAVE_SIGACTION
int
-sys_sigprocmask(tcp)
-struct tcb *tcp;
+sys_sigprocmask(struct tcb *tcp)
{
#ifdef ALPHA
+ sigset_t ss;
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, ...);
+ */
+ memcpy(&ss, &tcp->u_arg[1], sizeof(long));
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- tprintf(", ");
- printsigmask(tcp->u_arg[1], 0);
+ tprints(", ");
+ printsigmask(&ss, 0);
}
else if (!syserror(tcp)) {
- tcp->auxstr = sprintsigmask("old mask ", tcp->u_rval, 0);
+ memcpy(&ss, &tcp->u_rval, sizeof(long));
+ tcp->auxstr = sprintsigmask("old mask ", &ss, 0);
return RVAL_HEX | RVAL_STR;
}
#else /* !ALPHA */
if (entering(tcp)) {
-#ifdef SVR4
- if (tcp->u_arg[0] == 0)
- tprintf("0");
- else
-#endif /* SVR4 */
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- tprintf(", ");
+ tprints(", ");
print_sigset(tcp, tcp->u_arg[1], 0);
- tprintf(", ");
+ tprints(", ");
}
else {
if (!tcp->u_arg[2])
- tprintf("NULL");
+ tprints("NULL");
else if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[2]);
else
#endif /* HAVE_SIGACTION */
int
-sys_kill(tcp)
-struct tcb *tcp;
+sys_kill(struct tcb *tcp)
{
if (entering(tcp)) {
- tprintf("%ld, %s", tcp->u_arg[0], signame(tcp->u_arg[1]));
+ tprintf("%ld, %s",
+ widen_to_long(tcp->u_arg[0]),
+ signame(tcp->u_arg[1])
+ );
}
return 0;
}
-#if defined(FREEBSD) || defined(SUNOS4)
-int
-sys_killpg(tcp)
-struct tcb *tcp;
-{
- return sys_kill(tcp);
-}
-#endif /* FREEBSD || SUNOS4 */
-
-#ifdef LINUX
int
-sys_tgkill(tcp)
- struct tcb *tcp;
+sys_tgkill(struct tcb *tcp)
{
if (entering(tcp)) {
tprintf("%ld, %ld, %s",
- tcp->u_arg[0], tcp->u_arg[1], signame(tcp->u_arg[2]));
+ widen_to_long(tcp->u_arg[0]),
+ widen_to_long(tcp->u_arg[1]),
+ signame(tcp->u_arg[2])
+ );
}
return 0;
}
-#endif
int
-sys_sigpending(tcp)
-struct tcb *tcp;
+sys_sigpending(struct tcb *tcp)
{
sigset_t sigset;
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[0]);
else if (copy_sigset(tcp, tcp->u_arg[0], &sigset) < 0)
- tprintf("[?]");
+ tprints("[?]");
else
printsigmask(&sigset, 0);
}
return 0;
}
-#ifdef SVR4
-int sys_sigwait(tcp)
-struct tcb *tcp;
-{
- sigset_t sigset;
-
- if (entering(tcp)) {
- if (copy_sigset(tcp, tcp->u_arg[0], &sigset) < 0)
- tprintf("[?]");
- else
- printsigmask(&sigset, 0);
- }
- else {
- if (!syserror(tcp)) {
- tcp->auxstr = signalent[tcp->u_rval];
- return RVAL_DECIMAL | RVAL_STR;
- }
- }
- return 0;
-}
-#endif /* SVR4 */
-
-#ifdef LINUX
-
- int
-sys_rt_sigprocmask(tcp)
- struct tcb *tcp;
+int
+sys_rt_sigprocmask(struct tcb *tcp)
{
sigset_t sigset;
/* Note: arg[3] is the length of the sigset. */
if (entering(tcp)) {
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- tprintf(", ");
+ tprints(", ");
if (!tcp->u_arg[1])
- tprintf("NULL, ");
+ tprints("NULL, ");
else if (copy_sigset_len(tcp, tcp->u_arg[1], &sigset, tcp->u_arg[3]) < 0)
tprintf("%#lx, ", tcp->u_arg[1]);
else {
printsigmask(&sigset, 1);
- tprintf(", ");
+ tprints(", ");
}
}
else {
if (!tcp->u_arg[2])
-
- tprintf("NULL");
+ tprints("NULL");
else if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[2]);
else if (copy_sigset_len(tcp, tcp->u_arg[2], &sigset, tcp->u_arg[3]) < 0)
- tprintf("[?]");
+ tprints("[?]");
else
printsigmask(&sigset, 1);
tprintf(", %lu", tcp->u_arg[3]);
return 0;
}
-
/* Structure describing the action to be taken when a signal arrives. */
struct new_sigaction
{
- union
- {
- __sighandler_t __sa_handler;
- void (*__sa_sigaction) (int, siginfo_t *, void *);
- }
- __sigaction_handler;
+ /* sa_handler may be a libc #define, need to use other name: */
+ void (*__sa_handler)(int);
unsigned long sa_flags;
- void (*sa_restorer) (void);
- unsigned long int sa_mask[2];
+ void (*sa_restorer)(void);
+ /* 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_flags;
+ uint32_t sa_restorer;
+ uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)];
};
-
- int
-sys_rt_sigaction(tcp)
- struct tcb *tcp;
+int
+sys_rt_sigaction(struct tcb *tcp)
{
struct new_sigaction sa;
sigset_t sigset;
long addr;
+ int r;
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
addr = tcp->u_arg[1];
} else
addr = tcp->u_arg[2];
- if (addr == 0)
- tprintf("NULL");
- else if (!verbose(tcp))
+
+ if (addr == 0) {
+ tprints("NULL");
+ goto after_sa;
+ }
+ if (!verbose(tcp)) {
tprintf("%#lx", addr);
- else if (umove(tcp, addr, &sa) < 0)
- tprintf("{...}");
- else {
- switch ((long) sa.__sigaction_handler.__sa_handler) {
- case (long) SIG_ERR:
- tprintf("{SIG_ERR}");
- break;
- case (long) SIG_DFL:
- tprintf("{SIG_DFL}");
- break;
- case (long) SIG_IGN:
- tprintf("{SIG_IGN}");
- break;
- default:
- tprintf("{%#lx, ",
- (long) sa.__sigaction_handler.__sa_handler);
- sigemptyset(&sigset);
-#ifdef LINUXSPARC
- if (tcp->u_arg[4] <= sizeof(sigset))
- memcpy(&sigset, &sa.sa_mask, tcp->u_arg[4]);
+ goto after_sa;
+ }
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+ if (current_wordsize != sizeof(sa.sa_flags) && current_wordsize == 4) {
+ 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;
+ sa.sa_restorer = (void*)(unsigned long)sa32.sa_restorer;
+ /* 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);
+ }
+ } else
+#endif
+ {
+ r = umove(tcp, addr, &sa);
+ }
+ if (r < 0) {
+ tprints("{...}");
+ goto after_sa;
+ }
+ /* 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);
+ /* Questionable code below.
+ * Kernel won't handle sys_rt_sigaction
+ * with wrong sigset size (just returns EINVAL)
+ * therefore tcp->u_arg[3(4)] _must_ be NSIG / 8 here,
+ * and we always use smaller memcpy. */
+ sigemptyset(&sigset);
+#if defined(SPARC) || defined(SPARC64)
+ if (tcp->u_arg[4] <= sizeof(sigset))
+ memcpy(&sigset, &sa.sa_mask, tcp->u_arg[4]);
#else
- if (tcp->u_arg[3] <= sizeof(sigset))
- memcpy(&sigset, &sa.sa_mask, tcp->u_arg[3]);
+ if (tcp->u_arg[3] <= sizeof(sigset))
+ memcpy(&sigset, &sa.sa_mask, tcp->u_arg[3]);
#endif
- else
- memcpy(&sigset, &sa.sa_mask, sizeof(sigset));
- printsigmask(&sigset, 1);
- tprintf(", ");
- printflags(sigact_flags, sa.sa_flags, "SA_???");
+ else
+ memcpy(&sigset, &sa.sa_mask, sizeof(sigset));
+ printsigmask(&sigset, 1);
+ tprints(", ");
+ printflags(sigact_flags, sa.sa_flags, "SA_???");
#ifdef SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
+ if (sa.sa_flags & SA_RESTORER)
+ tprintf(", %p", sa.sa_restorer);
#endif
- tprintf("}");
- }
- }
+ tprints("}");
+
+ after_sa:
if (entering(tcp))
- tprintf(", ");
+ tprints(", ");
else
-#ifdef LINUXSPARC
+#if defined(SPARC) || defined(SPARC64)
tprintf(", %#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
#elif defined(ALPHA)
tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
#else
- tprintf(", %lu", addr = tcp->u_arg[3]);
+ tprintf(", %lu", tcp->u_arg[3]);
#endif
return 0;
}
- int
-sys_rt_sigpending(tcp)
- struct tcb *tcp;
+int
+sys_rt_sigpending(struct tcb *tcp)
{
sigset_t sigset;
tprintf("%#lx", tcp->u_arg[0]);
else if (copy_sigset_len(tcp, tcp->u_arg[0],
&sigset, tcp->u_arg[1]) < 0)
- tprintf("[?]");
+ tprints("[?]");
else
printsigmask(&sigset, 1);
}
return 0;
}
- int
-sys_rt_sigsuspend(tcp)
- struct tcb *tcp;
+
+int
+sys_rt_sigsuspend(struct tcb *tcp)
{
if (entering(tcp)) {
sigset_t sigm;
if (copy_sigset_len(tcp, tcp->u_arg[0], &sigm, tcp->u_arg[1]) < 0)
- tprintf("[?]");
+ tprints("[?]");
else
printsigmask(&sigm, 1);
}
return 0;
}
- int
-sys_rt_sigqueueinfo(tcp)
- struct tcb *tcp;
+
+static void
+print_sigqueueinfo(struct tcb *tcp, int sig, unsigned long uinfo)
+{
+ printsignal(sig);
+ tprints(", ");
+ printsiginfo_at(tcp, uinfo);
+}
+
+int
+sys_rt_sigqueueinfo(struct tcb *tcp)
{
if (entering(tcp)) {
- siginfo_t si;
tprintf("%lu, ", tcp->u_arg[0]);
- printsignal(tcp->u_arg[1]);
- tprintf(", ");
- if (umove(tcp, tcp->u_arg[2], &si) < 0)
- tprintf("%#lx", tcp->u_arg[2]);
- else
- printsiginfo(&si, verbose (tcp));
+ print_sigqueueinfo(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+ }
+ return 0;
+}
+
+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;
}
-int sys_rt_sigtimedwait(tcp)
- struct tcb *tcp;
+int sys_rt_sigtimedwait(struct tcb *tcp)
{
if (entering(tcp)) {
sigset_t sigset;
if (copy_sigset_len(tcp, tcp->u_arg[0],
&sigset, tcp->u_arg[3]) < 0)
- tprintf("[?]");
+ tprints("[?]");
else
printsigmask(&sigset, 1);
- tprintf(", ");
+ 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 {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[0]);
- else {
- siginfo_t si;
- if (umove(tcp, tcp->u_arg[1], &si) < 0)
- tprintf("%#lx", tcp->u_arg[1]);
- else
- printsiginfo(&si, verbose (tcp));
- /* XXX For now */
- tprintf(", %#lx", tcp->u_arg[2]);
- tprintf(", %d", (int) tcp->u_arg[3]);
- }
+ /* syscall exit, and u_arg[1] was NULL */
+ return 0;
}
+ print_timespec(tcp, tcp->u_arg[2]);
+ tprintf(", %d", (int) tcp->u_arg[3]);
return 0;
};
int
-sys_restart_syscall(tcp)
-struct tcb *tcp;
+sys_restart_syscall(struct tcb *tcp)
{
if (entering(tcp))
- tprintf("<... resuming interrupted call ...>");
+ tprints("<... resuming interrupted call ...>");
return 0;
}
-int
-sys_signalfd(tcp)
-struct tcb *tcp;
+static int
+do_signalfd(struct tcb *tcp, int flags_arg)
{
if (entering(tcp)) {
- tprintf("%ld, ", tcp->u_arg[0]);
+ printfd(tcp, tcp->u_arg[0]);
+ tprints(", ");
print_sigset(tcp, tcp->u_arg[1], 1);
- tprintf("%lu", tcp->u_arg[2]);
+ tprintf(", %lu", tcp->u_arg[2]);
+ if (flags_arg >= 0) {
+ tprints(", ");
+ printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+ }
}
return 0;
}
-#endif /* LINUX */
+
+int
+sys_signalfd(struct tcb *tcp)
+{
+ return do_signalfd(tcp, -1);
+}
+
+int
+sys_signalfd4(struct tcb *tcp)
+{
+ return do_signalfd(tcp, 3);
+}
projects / strace / blobdiff