Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval

[strace] / seccomp.c

diff --git a/seccomp.c b/seccomp.c
index e62f99a0c711429486060306dace58ff6a924e77..f778a6c4eaade4bf0339f52d0787141357164bae 100644 (file)
--- a/seccomp.c
+++ b/seccomp.c
@@ -108,6 +108,8 @@ decode_bpf_code(uint16_t code)
 
 }
 
+#endif /* HAVE_LINUX_FILTER_H */
+
 static void
 decode_bpf_stmt(const struct bpf_filter *filter)
 {
@@ -146,70 +148,61 @@ decode_bpf_jump(const struct bpf_filter *filter)
 #endif /* HAVE_LINUX_FILTER_H */
 }
 
-static void
-decode_filter(const struct bpf_filter *filter)
-{
-       if (filter->jt || filter->jf)
-               decode_bpf_jump(filter);
-       else
-               decode_bpf_stmt(filter);
-}
-
-#endif /* HAVE_LINUX_FILTER_H */
-
 #ifndef BPF_MAXINSNS
 # define BPF_MAXINSNS 4096
 #endif
 
-static void
-decode_seccomp_fprog(struct tcb *tcp, unsigned short len, unsigned long addr)
+static bool
+print_bpf_filter(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       struct bpf_filter filter;
-       const unsigned long start_addr = addr;
-       unsigned int i = 0;
-
-       for (; addr >= start_addr && i < len; ++i, addr += sizeof(filter)) {
-               if (i) {
-                       tprints(", ");
-                       if (i >= BPF_MAXINSNS) {
-                               tprints("...");
-                               break;
-                       }
-               }
-               if (umove_or_printaddr(tcp, addr, &filter))
-                       break;
-               if (!i)
-                       tprints("[");
-               decode_filter(&filter);
+       const struct bpf_filter *filter = elem_buf;
+       unsigned int *pn = data;
+
+       if ((*pn)++ >= BPF_MAXINSNS) {
+               tprints("...");
+               return false;
        }
-       if (i)
-               tprints("]");
+
+       if (filter->jt || filter->jf)
+               decode_bpf_jump(filter);
+       else
+               decode_bpf_stmt(filter);
+
+       return true;
 }
 
-static void
-print_seccomp_fprog(struct tcb *tcp, unsigned short len, unsigned long addr)
+void
+print_seccomp_fprog(struct tcb *const tcp, const kernel_ulong_t addr,
+                   const unsigned short len)
 {
-       tprintf("{len=%u, filter=", len);
-       if (abbrev(tcp) || !len)
+       if (abbrev(tcp)) {
                printaddr(addr);
-       else
-               decode_seccomp_fprog(tcp, len, addr);
-       tprints("}");
+       } else {
+               unsigned int insns = 0;
+               struct bpf_filter filter;
+
+               print_array(tcp, addr, len, &filter, sizeof(filter),
+                           umoven_or_printaddr, print_bpf_filter, &insns);
+       }
 }
 
 #include "seccomp_fprog.h"
 
 void
-print_seccomp_filter(struct tcb *tcp, unsigned long addr)
+print_seccomp_filter(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct seccomp_fprog fprog;
 
-       if (fetch_seccomp_fprog(tcp, addr, &fprog))
-               print_seccomp_fprog(tcp, fprog.len, fprog.filter);
+       if (fetch_seccomp_fprog(tcp, addr, &fprog)) {
+               tprintf("{len=%hu, filter=", fprog.len);
+               print_seccomp_fprog(tcp, fprog.filter, fprog.len);
+               tprints("}");
+       }
 }
 
 static void
-decode_seccomp_set_mode_strict(unsigned int flags, unsigned long addr)
+decode_seccomp_set_mode_strict(const unsigned int flags,
+                              const kernel_ulong_t addr)
 {
        tprintf("%u, ", flags);
        printaddr(addr);