projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syslog: set sane priority values
[project/procd.git]
/
trace
/
trace.c
diff --git
a/trace/trace.c
b/trace/trace.c
index
c6f32d7
..
b0005b8
100644
(file)
--- a/
trace/trace.c
+++ b/
trace/trace.c
@@
-14,9
+14,9
@@
#define _GNU_SOURCE
#include <stddef.h>
#include <sys/ptrace.h>
#define _GNU_SOURCE
#include <stddef.h>
#include <sys/ptrace.h>
+#include <sys/types.h>
#include <sys/user.h>
#include <sys/wait.h>
#include <sys/user.h>
#include <sys/wait.h>
-#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@
-42,6
+42,8
@@
# define EF_REG2 8
# endif
#define reg_syscall_nr (EF_REG2 / 4)
# define EF_REG2 8
# endif
#define reg_syscall_nr (EF_REG2 / 4)
+#elif defined(__arm__)
+#define reg_syscall_nr _offsetof(struct user, regs.uregs[7])
#else
#error tracing is not supported on this architecture
#endif
#else
#error tracing is not supported on this architecture
#endif
@@
-51,7
+53,7
@@
} while (0)
#define ERROR(fmt, ...) do { \
} while (0)
#define ERROR(fmt, ...) do { \
- syslog(
0
, "utrace: "fmt, ## __VA_ARGS__); \
+ syslog(
LOG_ERR
, "utrace: "fmt, ## __VA_ARGS__); \
fprintf(stderr, "utrace: "fmt, ## __VA_ARGS__); \
} while (0)
fprintf(stderr, "utrace: "fmt, ## __VA_ARGS__); \
} while (0)
@@
-214,7
+216,8
@@
int main(int argc, char **argv, char **envp)
uloop_done();
if (!json)
uloop_done();
if (!json)
- asprintf(&json, "/tmp/%s.%u.json", basename(*argv), child);
+ if (asprintf(&json, "/tmp/%s.%u.json", basename(*argv), child) < 0)
+ ERROR("failed to allocate output path: %s\n", strerror(errno));
print_syscalls(policy, json);
print_syscalls(policy, json);