diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c index 60c62e131d36..5d8b5c2e8f9f 100644 --- a/usr.bin/truss/alpha-fbsd.c +++ b/usr.bin/truss/alpha-fbsd.c @@ -1,360 +1,364 @@ /* * Copryight 1998 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * FreeBSD/alpha-specific system call handling. This is probably the most * complex part of the entire truss program, although I've got lots of * it handled relatively cleanly now. The system call names are generated * automatically, thanks to /usr/src/sys/kern/syscalls.master. The * names used for the various structures are confusing, I sadly admit. * * This file is almost nothing more than a slightly-edited i386-fbsd.c. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "syscalls.h" static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct freebsd_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long *args; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.args) { free(fsc.args); } if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in alpha/alpha/trap.c * is ever changed these functions need to keep up. */ void alpha_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; - struct reg regs = { { 0 } }; - int syscall; + struct reg regs; + int syscall_num; int i; unsigned int parm_offset; struct syscall *sc; int indir = 0; /* indirect system call */ if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } parm_offset = regs.r_regs[R_SP] + sizeof(int); /* * FreeBSD has two special kinds of system call redirctions -- * SYS_syscall, and SYS___syscall. The former is the old syscall() * routine, basicly; the latter is for quad-aligned arguments. */ - syscall = regs.r_regs[R_V0]; - if (syscall == SYS_syscall || syscall == SYS___syscall) { + syscall_num = regs.r_regs[R_V0]; + if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) { indir = 1; - syscall = regs.r_regs[R_A0]; + syscall_num = regs.r_regs[R_A0]; } - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "fork") || !strcmp(fsc.name, "rfork") || !strcmp(fsc.name, "vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; fsc.args = malloc((1+nargs) * sizeof(unsigned long)); switch (nargs) { default: /* * The OS doesn't seem to allow more than 10 words of * parameters (yay!). So we shouldn't be here. */ warn("More than 10 words (%d) of arguments!\n", nargs); break; case 10: case 9: case 8: case 7: /* * If there are 7-10 words of arguments, they are placed * on the stack, as is normal for other processors. * The fall-through for all of these is deliberate!!! */ lseek(Procfd, regs.r_regs[R_SP], SEEK_SET); read(fd, &fsc.args[6], (nargs - 6) * sizeof(fsc.args[0])); case 6: fsc.args[5] = regs.r_regs[R_A5]; case 5: fsc.args[4] = regs.r_regs[R_A4]; case 4: fsc.args[3] = regs.r_regs[R_A3]; case 3: fsc.args[2] = regs.r_regs[R_A2]; case 2: fsc.args[1] = regs.r_regs[R_A1]; case 1: fsc.args[0] = regs.r_regs[R_A0]; case 0: break; } if (indir) { memmove(&fsc.args[0], &fsc.args[1], (nargs-1) * sizeof(fsc.args[0])); } sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * And when the system call is done, we handle it here. * Currently, no attempt is made to ensure that the system calls * match -- this needs to be fixed (and is, in fact, why S_SCX includes * the sytem call number instead of, say, an error status). */ int -alpha_syscall_exit(struct trussinfo *trussinfo, int syscall) { +alpha_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { fprintf(trussinfo->outfile, "\n"); - return; + return (-1); } retval = regs.r_regs[R_V0]; errorp = !!(regs.r_regs[R_A3]); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, retval); clear_fsc(); return (retval); } diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c index 8a3537bd170c..95e0dfbee430 100644 --- a/usr.bin/truss/amd64-fbsd32.c +++ b/usr.bin/truss/amd64-fbsd32.c @@ -1,339 +1,343 @@ /* * Copryight 1997 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * FreeBSD/386-specific system call handling. This is probably the most * complex part of the entire truss program, although I've got lots of * it handled relatively cleanly now. The system call names are generated * automatically, thanks to /usr/src/sys/kern/syscalls.master. The * names used for the various structures are confusing, I sadly admit. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "syscalls.h" static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct freebsd_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long *args; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.args) { free(fsc.args); } if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in i386/i386/trap.c * is ever changed these functions need to keep up. */ void i386_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; - struct reg regs = { 0 }; - int syscall; + struct reg regs; + int syscall_num; int i; unsigned int parm_offset; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } parm_offset = regs.r_esp + sizeof(int); /* * FreeBSD has two special kinds of system call redirctions -- * SYS_syscall, and SYS___syscall. The former is the old syscall() * routine, basicly; the latter is for quad-aligned arguments. */ - syscall = regs.r_eax; - switch (syscall) { + syscall_num = regs.r_eax; + switch (syscall_num) { case SYS_syscall: lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall, sizeof(int)); + read(Procfd, &syscall_num, sizeof(int)); parm_offset += sizeof(int); break; case SYS___syscall: lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall, sizeof(int)); + read(Procfd, &syscall_num, sizeof(int)); parm_offset += sizeof(quad_t); break; } - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "fork") || !strcmp(fsc.name, "rfork") || !strcmp(fsc.name, "vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; fsc.args = malloc((1+nargs) * sizeof(unsigned long)); lseek(Procfd, parm_offset, SEEK_SET); if (read(Procfd, fsc.args, nargs * sizeof(unsigned long)) == -1) return; sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * And when the system call is done, we handle it here. * Currently, no attempt is made to ensure that the system calls * match -- this needs to be fixed (and is, in fact, why S_SCX includes * the sytem call number instead of, say, an error status). */ int -i386_syscall_exit(struct trussinfo *trussinfo, int syscall) { +i386_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return (-1); } retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, retval); clear_fsc(); return (retval); } diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c index 908d833574ab..e2f17e7f69f0 100644 --- a/usr.bin/truss/amd64-linux32.c +++ b/usr.bin/truss/amd64-linux32.c @@ -1,335 +1,339 @@ /* * Copryight 1997 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * Linux/i386-specific system call handling. Given how much of this code * is taken from the freebsd equivalent, I can probably put even more of * it in support routines that can be used by any personality support. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "linux_syscalls.h" static int nsyscalls = sizeof(linux_syscallnames) / sizeof(linux_syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct linux_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long args[5]; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in i386/i386/trap.c * is ever changed these functions need to keep up. */ void i386_linux_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; - struct reg regs = { 0 }; - int syscall; + struct reg regs; + int syscall_num; int i; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); - syscall = regs.r_eax; + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } + syscall_num = regs.r_eax; - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : linux_syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : linux_syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "linux_fork") || !strcmp(fsc.name, "linux_vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; /* * Linux passes syscall arguments in registers, not * on the stack. Fortunately, we've got access to the * register set. Note that we don't bother checking the * number of arguments. And what does linux do for syscalls * that have more than five arguments? */ fsc.args[0] = regs.r_ebx; fsc.args[1] = regs.r_ecx; fsc.args[2] = regs.r_edx; fsc.args[3] = regs.r_esi; fsc.args[4] = regs.r_edi; sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "linux_execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "linux_execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * Linux syscalls return negative errno's, we do positive and map them */ const int bsd_to_linux_errno[] = { -0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -35, -12, -13, -14, -15, -16, -17, -18, -19, -20, -21, -22, -23, -24, -25, -26, -27, -28, -29, -30, -31, -32, -33, -34, -11,-115,-114, -88, -89, -90, -91, -92, -93, -94, -95, -96, -97, -98, -99, -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, -6, }; int -i386_linux_syscall_exit(struct trussinfo *trussinfo, int syscall) { +i386_linux_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { fprintf(trussinfo->outfile, "\n"); - return; + return (-1); } retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ if (errorp) { - for (i = 0; i < sizeof(bsd_to_linux_errno) / sizeof(int); i++) + for (i = 0; (size_t)i < sizeof(bsd_to_linux_errno) / sizeof(int); i++) if (retval == bsd_to_linux_errno[i]) break; } print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, errorp ? i : retval); clear_fsc(); return (retval); } diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c index 8a3537bd170c..95e0dfbee430 100644 --- a/usr.bin/truss/i386-fbsd.c +++ b/usr.bin/truss/i386-fbsd.c @@ -1,339 +1,343 @@ /* * Copryight 1997 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * FreeBSD/386-specific system call handling. This is probably the most * complex part of the entire truss program, although I've got lots of * it handled relatively cleanly now. The system call names are generated * automatically, thanks to /usr/src/sys/kern/syscalls.master. The * names used for the various structures are confusing, I sadly admit. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "syscalls.h" static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct freebsd_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long *args; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.args) { free(fsc.args); } if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in i386/i386/trap.c * is ever changed these functions need to keep up. */ void i386_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; - struct reg regs = { 0 }; - int syscall; + struct reg regs; + int syscall_num; int i; unsigned int parm_offset; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } parm_offset = regs.r_esp + sizeof(int); /* * FreeBSD has two special kinds of system call redirctions -- * SYS_syscall, and SYS___syscall. The former is the old syscall() * routine, basicly; the latter is for quad-aligned arguments. */ - syscall = regs.r_eax; - switch (syscall) { + syscall_num = regs.r_eax; + switch (syscall_num) { case SYS_syscall: lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall, sizeof(int)); + read(Procfd, &syscall_num, sizeof(int)); parm_offset += sizeof(int); break; case SYS___syscall: lseek(Procfd, parm_offset, SEEK_SET); - read(Procfd, &syscall, sizeof(int)); + read(Procfd, &syscall_num, sizeof(int)); parm_offset += sizeof(quad_t); break; } - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "fork") || !strcmp(fsc.name, "rfork") || !strcmp(fsc.name, "vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; fsc.args = malloc((1+nargs) * sizeof(unsigned long)); lseek(Procfd, parm_offset, SEEK_SET); if (read(Procfd, fsc.args, nargs * sizeof(unsigned long)) == -1) return; sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * And when the system call is done, we handle it here. * Currently, no attempt is made to ensure that the system calls * match -- this needs to be fixed (and is, in fact, why S_SCX includes * the sytem call number instead of, say, an error status). */ int -i386_syscall_exit(struct trussinfo *trussinfo, int syscall) { +i386_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { - fprintf(trussinfo->outfile, "\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return (-1); } retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, retval); clear_fsc(); return (retval); } diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c index 908d833574ab..e2f17e7f69f0 100644 --- a/usr.bin/truss/i386-linux.c +++ b/usr.bin/truss/i386-linux.c @@ -1,335 +1,339 @@ /* * Copryight 1997 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * Linux/i386-specific system call handling. Given how much of this code * is taken from the freebsd equivalent, I can probably put even more of * it in support routines that can be used by any personality support. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "linux_syscalls.h" static int nsyscalls = sizeof(linux_syscallnames) / sizeof(linux_syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct linux_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long args[5]; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in i386/i386/trap.c * is ever changed these functions need to keep up. */ void i386_linux_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; - struct reg regs = { 0 }; - int syscall; + struct reg regs; + int syscall_num; int i; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); - syscall = regs.r_eax; + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } + syscall_num = regs.r_eax; - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : linux_syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : linux_syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "linux_fork") || !strcmp(fsc.name, "linux_vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; /* * Linux passes syscall arguments in registers, not * on the stack. Fortunately, we've got access to the * register set. Note that we don't bother checking the * number of arguments. And what does linux do for syscalls * that have more than five arguments? */ fsc.args[0] = regs.r_ebx; fsc.args[1] = regs.r_ecx; fsc.args[2] = regs.r_edx; fsc.args[3] = regs.r_esi; fsc.args[4] = regs.r_edi; sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "linux_execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "linux_execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * Linux syscalls return negative errno's, we do positive and map them */ const int bsd_to_linux_errno[] = { -0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -35, -12, -13, -14, -15, -16, -17, -18, -19, -20, -21, -22, -23, -24, -25, -26, -27, -28, -29, -30, -31, -32, -33, -34, -11,-115,-114, -88, -89, -90, -91, -92, -93, -94, -95, -96, -97, -98, -99, -100,-101,-102,-103,-104,-105,-106,-107,-108,-109, -110,-111, -40, -36,-112,-113, -39, -11, -87,-122, -116, -66, -6, -6, -6, -6, -6, -37, -38, -9, -6, }; int -i386_linux_syscall_exit(struct trussinfo *trussinfo, int syscall) { +i386_linux_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { fprintf(trussinfo->outfile, "\n"); - return; + return (-1); } retval = regs.r_eax; errorp = !!(regs.r_eflags & PSL_C); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ if (errorp) { - for (i = 0; i < sizeof(bsd_to_linux_errno) / sizeof(int); i++) + for (i = 0; (size_t)i < sizeof(bsd_to_linux_errno) / sizeof(int); i++) if (retval == bsd_to_linux_errno[i]) break; } print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, errorp ? i : retval); clear_fsc(); return (retval); } diff --git a/usr.bin/truss/sparc64-fbsd.c b/usr.bin/truss/sparc64-fbsd.c index 552eb600336f..9fc1db60f92a 100644 --- a/usr.bin/truss/sparc64-fbsd.c +++ b/usr.bin/truss/sparc64-fbsd.c @@ -1,362 +1,366 @@ /* * Copryight 1998 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Sean Eric Fagan * 4. Neither the name of the author may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY 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. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ /* * FreeBSD/sparc64-specific system call handling. This is probably the most * complex part of the entire truss program, although I've got lots of * it handled relatively cleanly now. The system call names are generated * automatically, thanks to /usr/src/sys/kern/syscalls.master. The * names used for the various structures are confusing, I sadly admit. * * This file is almost nothing more than a slightly-edited i386-fbsd.c. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "truss.h" #include "syscall.h" +#include "extern.h" static int fd = -1; static int cpid = -1; extern int Procfd; #include "syscalls.h" static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]); /* * This is what this particular file uses to keep track of a system call. * It is probably not quite sufficient -- I can probably use the same * structure for the various syscall personalities, and I also probably * need to nest system calls (for signal handlers). * * 'struct syscall' describes the system call; it may be NULL, however, * if we don't know about this particular system call yet. */ static struct freebsd_syscall { struct syscall *sc; - char *name; + const char *name; int number; unsigned long *args; int nargs; /* number of arguments -- *not* number of words! */ char **s_args; /* the printable arguments */ } fsc; /* Clear up and free parts of the fsc structure. */ static __inline void -clear_fsc() { +clear_fsc(void) { if (fsc.args) { free(fsc.args); } if (fsc.s_args) { int i; for (i = 0; i < fsc.nargs; i++) if (fsc.s_args[i]) free(fsc.s_args[i]); free(fsc.s_args); } memset(&fsc, 0, sizeof(fsc)); } /* * Called when a process has entered a system call. nargs is the * number of words, not number of arguments (a necessary distinction * in some cases). Note that if the STOPEVENT() code in sparc64/sparc64/trap.c * is ever changed these functions need to keep up. */ void sparc64_syscall_entry(struct trussinfo *trussinfo, int nargs) { char buf[32]; struct reg regs; - int syscall; + int syscall_num; int i; struct syscall *sc; int indir = 0; /* indirect system call */ if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDWR); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); return; } cpid = trussinfo->pid; } clear_fsc(); lseek(fd, 0L, 0); - i = read(fd, ®s, sizeof(regs)); + if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { + fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); + return; + } /* * FreeBSD has two special kinds of system call redirctions -- * SYS_syscall, and SYS___syscall. The former is the old syscall() * routine, basicly; the latter is for quad-aligned arguments. */ - syscall = regs.r_global[1]; - if (syscall == SYS_syscall || syscall == SYS___syscall) { + syscall_num = regs.r_global[1]; + if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) { indir = 1; - syscall = regs.r_out[0]; + syscall_num = regs.r_out[0]; } - fsc.number = syscall; + fsc.number = syscall_num; fsc.name = - (syscall < 0 || syscall > nsyscalls) ? NULL : syscallnames[syscall]; + (syscall_num < 0 || syscall_num > nsyscalls) ? NULL : syscallnames[syscall_num]; if (!fsc.name) { - fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall); + fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && ((!strcmp(fsc.name, "fork") || !strcmp(fsc.name, "rfork") || !strcmp(fsc.name, "vfork")))) { trussinfo->in_fork = 1; } if (nargs == 0) return; fsc.args = malloc((1+nargs) * sizeof(unsigned long)); switch (nargs) { default: /* * The OS doesn't seem to allow more than 10 words of * parameters (yay!). So we shouldn't be here. */ warn("More than 10 words (%d) of arguments!\n", nargs); break; case 10: case 9: case 8: case 7: /* * If there are 7-10 words of arguments, they are placed * on the stack, as is normal for other processors. * The fall-through for all of these is deliberate!!! */ lseek(Procfd, regs.r_out[6] + SPOFF + offsetof(struct frame, fr_pad[6]), SEEK_SET); read(fd, &fsc.args[6], (nargs - 6) * sizeof(fsc.args[0])); case 6: fsc.args[5] = regs.r_out[5]; case 5: fsc.args[4] = regs.r_out[4]; case 4: fsc.args[3] = regs.r_out[3]; case 3: fsc.args[2] = regs.r_out[2]; case 2: fsc.args[1] = regs.r_out[1]; case 1: fsc.args[0] = regs.r_out[0]; case 0: break; } if (indir) { memmove(&fsc.args[0], &fsc.args[1], (nargs-1) * sizeof(fsc.args[0])); } sc = get_syscall(fsc.name); if (sc) { fsc.nargs = sc->nargs; } else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n", fsc.name, nargs); #endif fsc.nargs = nargs; } fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*)); memset(fsc.s_args, 0, fsc.nargs * sizeof(char*)); fsc.sc = sc; /* * At this point, we set up the system call arguments. * We ignore any OUT ones, however -- those are arguments that * are set by the system call, and so are probably meaningless * now. This doesn't currently support arguments that are * passed in *and* out, however. */ if (fsc.name) { #if DEBUG fprintf(stderr, "syscall %s(", fsc.name); #endif for (i = 0; i < fsc.nargs; i++) { #if DEBUG fprintf(stderr, "0x%x%s", sc ? fsc.args[sc->args[i].offset] : fsc.args[i], i < (fsc.nargs - 1) ? "," : ""); #endif if (sc && !(sc->args[i].type & OUT)) { fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args); } } #if DEBUG fprintf(stderr, ")\n"); #endif } #if DEBUG fprintf(trussinfo->outfile, "\n"); #endif /* * Some system calls should be printed out before they are done -- * execve() and exit(), for example, never return. Possibly change * this to work for any system call that doesn't have an OUT * parameter? */ if (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit")) { /* XXX * This could be done in a more general * manner but it still wouldn't be very pretty. */ if (!strcmp(fsc.name, "execve")) { if ((trussinfo->flags & EXECVEARGS) == 0) if (fsc.s_args[1]) { free(fsc.s_args[1]); fsc.s_args[1] = NULL; } if ((trussinfo->flags & EXECVEENVS) == 0) if (fsc.s_args[2]) { free(fsc.s_args[2]); fsc.s_args[2] = NULL; } } print_syscall(trussinfo, fsc.name, fsc.nargs, fsc.s_args); fprintf(trussinfo->outfile, "\n"); } return; } /* * And when the system call is done, we handle it here. * Currently, no attempt is made to ensure that the system calls * match -- this needs to be fixed (and is, in fact, why S_SCX includes * the sytem call number instead of, say, an error status). */ int -sparc64_syscall_exit(struct trussinfo *trussinfo, int syscall) { +sparc64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { char buf[32]; struct reg regs; int retval; int i; int errorp; struct syscall *sc; if (fd == -1 || trussinfo->pid != cpid) { sprintf(buf, "/proc/%d/regs", trussinfo->pid); fd = open(buf, O_RDONLY); if (fd == -1) { - fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); - return; + fprintf(trussinfo->outfile, "-- CANNOT OPEN REGISTERS --\n"); + return (-1); } cpid = trussinfo->pid; } lseek(fd, 0L, 0); if (read(fd, ®s, sizeof(regs)) != sizeof(regs)) { fprintf(trussinfo->outfile, "\n"); - return; + return (-1); } retval = regs.r_out[0]; errorp = !!(regs.r_tstate & TSTATE_XCC_C); /* * This code, while simpler than the initial versions I used, could * stand some significant cleaning. */ sc = fsc.sc; if (!sc) { for (i = 0; i < fsc.nargs; i++) { fsc.s_args[i] = malloc(12); sprintf(fsc.s_args[i], "0x%lx", fsc.args[i]); } } else { /* * Here, we only look for arguments that have OUT masked in -- * otherwise, they were handled in the syscall_entry function. */ for (i = 0; i < sc->nargs; i++) { char *temp; if (sc->args[i].type & OUT) { /* * If an error occurred, than don't bothe getting the data; * it may not be valid. */ if (errorp) { temp = malloc(12); sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]); } else { temp = print_arg(Procfd, &sc->args[i], fsc.args); } fsc.s_args[i] = temp; } } } /* * It would probably be a good idea to merge the error handling, * but that complicates things considerably. */ print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, retval); clear_fsc(); return (retval); }