/*
* Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
break;
case BPF_ST:
case BPF_STX:
- if (i)
- tprintf("|%#x /* %s */", i, "BPF_???");
+ if (i) {
+ tprintf("|%#x", i);
+ tprints_comment("BPF_???");
+ }
break;
case BPF_ALU:
tprints("|");
tprints("|");
printxval(bpf_rval, BPF_RVAL(code), "BPF_???");
i &= ~BPF_RVAL(code);
- if (i)
- tprintf("|%#x /* %s */", i, "BPF_???");
+ if (i) {
+ tprintf("|%#x", i);
+ tprints_comment("BPF_???");
+ }
break;
case BPF_MISC:
tprints("|");
printxval(bpf_miscop, BPF_MISCOP(code), "BPF_???");
i &= ~BPF_MISCOP(code);
- if (i)
- tprintf("|%#x /* %s */", i, "BPF_???");
+ if (i) {
+ tprintf("|%#x", i);
+ tprints_comment("BPF_???");
+ }
break;
}
}
+#endif /* HAVE_LINUX_FILTER_H */
+
static void
decode_bpf_stmt(const struct bpf_filter *filter)
{
#endif /* HAVE_LINUX_FILTER_H */
}
-static void
-decode_filter(const struct bpf_filter *filter)
+#ifndef BPF_MAXINSNS
+# define BPF_MAXINSNS 4096
+#endif
+
+static bool
+print_bpf_filter(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
+ const struct bpf_filter *filter = elem_buf;
+ unsigned int *pn = data;
+
+ if ((*pn)++ >= BPF_MAXINSNS) {
+ tprints("...");
+ return false;
+ }
+
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
+ return true;
+}
-static void
-decode_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)
{
- if (!len || abbrev(tcp)) {
- tprintf("{len = %u, filter = ", len);
+ if (abbrev(tcp)) {
printaddr(addr);
- tprints("}");
} else {
- unsigned int i = 0;
-
- tprints("[");
- while (i < len && i < BPF_MAXINSNS) {
- struct bpf_filter filter;
-
- if (umove(tcp, addr, &filter) < 0)
- break;
- if (i)
- tprints(", ");
- decode_filter(&filter);
-
- addr += sizeof(filter);
- ++i;
- }
- if (i < len)
- tprints("...");
- tprints("]");
+ 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))
- decode_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);