]> granicus.if.org Git - strace/blobdiff - pathtrace.c
Update NEWS
[strace] / pathtrace.c
index 894dd5c963eb30c8162c956c40e3add1f0fad01e..398fb287adf6afbfae7984c3996456e5adb52c86 100644 (file)
 
 #include "defs.h"
 #include <sys/param.h>
-#if defined HAVE_POLL_H
-# include <poll.h>
-#elif defined HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
+#include <poll.h>
 
 #include "syscall.h"
 
@@ -141,8 +137,7 @@ pathtrace_select(const char *path)
                return;
        }
 
-       fprintf(stderr, "Requested path '%s' resolved into '%s'\n",
-               path, rpath);
+       error_msg("Requested path '%s' resolved into '%s'", path, rpath);
        storepath(rpath);
 }
 
@@ -165,100 +160,91 @@ pathtrace_match(struct tcb *tcp)
         * other than test arg[0].
         */
 
-       if (s->sys_func == sys_dup2 ||
-           s->sys_func == sys_dup3 ||
-           s->sys_func == sys_sendfile ||
-           s->sys_func == sys_sendfile64 ||
-           s->sys_func == sys_tee)
-       {
+       switch (s->sen) {
+       case SEN_dup2:
+       case SEN_dup3:
+       case SEN_kexec_file_load:
+       case SEN_sendfile:
+       case SEN_sendfile64:
+       case SEN_tee:
                /* fd, fd */
                return fdmatch(tcp, tcp->u_arg[0]) ||
                        fdmatch(tcp, tcp->u_arg[1]);
-       }
 
-       if (s->sys_func == sys_inotify_add_watch ||
-           s->sys_func == sys_faccessat ||
-           s->sys_func == sys_fchmodat ||
-           s->sys_func == sys_futimesat ||
-           s->sys_func == sys_unlinkat ||
-           s->sys_func == sys_newfstatat ||
-           s->sys_func == sys_mknodat ||
-           s->sys_func == sys_openat ||
-           s->sys_func == sys_readlinkat ||
-           s->sys_func == sys_utimensat ||
-           s->sys_func == sys_fchownat ||
-           s->sys_func == sys_pipe2)
-       {
+       case SEN_faccessat:
+       case SEN_fchmodat:
+       case SEN_fchownat:
+       case SEN_fstatat64:
+       case SEN_futimesat:
+       case SEN_inotify_add_watch:
+       case SEN_mkdirat:
+       case SEN_mknodat:
+       case SEN_name_to_handle_at:
+       case SEN_newfstatat:
+       case SEN_openat:
+       case SEN_readlinkat:
+       case SEN_unlinkat:
+       case SEN_utimensat:
                /* fd, path */
                return fdmatch(tcp, tcp->u_arg[0]) ||
                        upathmatch(tcp, tcp->u_arg[1]);
-       }
 
-       if (s->sys_func == sys_link ||
-           s->sys_func == sys_mount)
-       {
+       case SEN_link:
+       case SEN_mount:
+       case SEN_pivotroot:
                /* path, path */
                return upathmatch(tcp, tcp->u_arg[0]) ||
                        upathmatch(tcp, tcp->u_arg[1]);
-       }
 
-       if (s->sys_func == sys_quotactl)
-       {
+       case SEN_quotactl:
                /* x, path */
                return upathmatch(tcp, tcp->u_arg[1]);
-       }
 
-       if (s->sys_func == sys_renameat ||
-           s->sys_func == sys_renameat2 ||
-           s->sys_func == sys_linkat)
-       {
+       case SEN_linkat:
+       case SEN_renameat2:
+       case SEN_renameat:
                /* fd, path, fd, path */
                return fdmatch(tcp, tcp->u_arg[0]) ||
                        fdmatch(tcp, tcp->u_arg[2]) ||
                        upathmatch(tcp, tcp->u_arg[1]) ||
                        upathmatch(tcp, tcp->u_arg[3]);
-       }
 
-       if (
-           s->sys_func == sys_old_mmap ||
+       case SEN_old_mmap:
 #if defined(S390)
-           s->sys_func == sys_old_mmap_pgoff ||
+       case SEN_old_mmap_pgoff:
 #endif
-           s->sys_func == sys_mmap ||
-           s->sys_func == sys_mmap_pgoff ||
-           s->sys_func == sys_mmap_4koff
-       ) {
+       case SEN_mmap:
+       case SEN_mmap_4koff:
+       case SEN_mmap_pgoff:
+       case SEN_ARCH_mmap:
                /* x, x, x, x, fd */
                return fdmatch(tcp, tcp->u_arg[4]);
-       }
 
-       if (s->sys_func == sys_symlinkat) {
+       case SEN_symlinkat:
                /* path, fd, path */
                return fdmatch(tcp, tcp->u_arg[1]) ||
                        upathmatch(tcp, tcp->u_arg[0]) ||
                        upathmatch(tcp, tcp->u_arg[2]);
-       }
 
-       if (s->sys_func == sys_splice) {
-               /* fd, x, fd, x, x */
+       case SEN_copy_file_range:
+       case SEN_splice:
+               /* fd, x, fd, x, x, x */
                return fdmatch(tcp, tcp->u_arg[0]) ||
                        fdmatch(tcp, tcp->u_arg[2]);
-       }
 
-       if (s->sys_func == sys_epoll_ctl) {
+       case SEN_epoll_ctl:
                /* x, x, fd, x */
                return fdmatch(tcp, tcp->u_arg[2]);
-       }
 
-       if (s->sys_func == sys_fanotify_mark) {
+
+       case SEN_fanotify_mark:
                /* x, x, x, fd, path */
                return fdmatch(tcp, tcp->u_arg[3]) ||
                        upathmatch(tcp, tcp->u_arg[4]);
-       }
 
-       if (s->sys_func == sys_select ||
-           s->sys_func == sys_oldselect ||
-           s->sys_func == sys_pselect6)
+       case SEN_oldselect:
+       case SEN_pselect6:
+       case SEN_select:
        {
                int     i, j;
                int     nfds;
@@ -267,11 +253,11 @@ pathtrace_match(struct tcb *tcp)
                fd_set *fds;
 
                args = tcp->u_arg;
-               if (s->sys_func == sys_oldselect) {
+               if (SEN_oldselect == s->sen) {
                        if (umoven(tcp, tcp->u_arg[0], sizeof oldargs,
                                   oldargs) < 0)
                        {
-                               fprintf(stderr, "umoven() failed\n");
+                               error_msg("umoven() failed");
                                return 0;
                        }
                        args = oldargs;
@@ -292,7 +278,7 @@ pathtrace_match(struct tcb *tcp)
                        if (args[i] == 0)
                                continue;
                        if (umoven(tcp, args[i], fdsize, fds) < 0) {
-                               fprintf(stderr, "umoven() failed\n");
+                               error_msg("umoven() failed");
                                continue;
                        }
                        for (j = 0;; j++) {
@@ -309,8 +295,8 @@ pathtrace_match(struct tcb *tcp)
                return 0;
        }
 
-       if (s->sys_func == sys_poll ||
-           s->sys_func == sys_ppoll)
+       case SEN_poll:
+       case SEN_ppoll:
        {
                struct pollfd fds;
                unsigned nfds;
@@ -332,20 +318,24 @@ pathtrace_match(struct tcb *tcp)
                return 0;
        }
 
-       if (s->sys_func == printargs ||
-           s->sys_func == sys_pipe ||
-           s->sys_func == sys_pipe2 ||
-           s->sys_func == sys_eventfd2 ||
-           s->sys_func == sys_eventfd ||
-           s->sys_func == sys_inotify_init1 ||
-           s->sys_func == sys_timerfd_create ||
-           s->sys_func == sys_timerfd_settime ||
-           s->sys_func == sys_timerfd_gettime ||
-           s->sys_func == sys_epoll_create ||
-           s->sys_func == sys_socket ||
-           s->sys_func == sys_socketpair ||
-           s->sys_func == sys_fanotify_init)
-       {
+       case SEN_bpf:
+       case SEN_epoll_create:
+       case SEN_epoll_create1:
+       case SEN_eventfd2:
+       case SEN_eventfd:
+       case SEN_fanotify_init:
+       case SEN_inotify_init1:
+       case SEN_memfd_create:
+       case SEN_perf_event_open:
+       case SEN_pipe:
+       case SEN_pipe2:
+       case SEN_printargs:
+       case SEN_socket:
+       case SEN_socketpair:
+       case SEN_timerfd_create:
+       case SEN_timerfd_gettime:
+       case SEN_timerfd_settime:
+       case SEN_userfaultfd:
                /*
                 * These have TRACE_FILE or TRACE_DESCRIPTOR or TRACE_NETWORK set,
                 * but they don't have any file descriptor or path args to test.