Add syscall logging support for x86_64 architectures on Android.
Bug: 26776934
Change-Id: I54d62bb74e4359beca4852484a77a3a007f17c42
diff --git a/examples/drop_privs.cpp b/examples/drop_privs.cpp
index fb6b42e..26d1659 100644
--- a/examples/drop_privs.cpp
+++ b/examples/drop_privs.cpp
@@ -57,6 +57,9 @@
minijail_change_group(j, "system");
minijail_set_supplementary_gids(j, sizeof(groups) / sizeof(groups[0]), groups);
// minijail_use_caps(j, CAP_TO_MASK(CAP_SETUID) | CAP_TO_MASK(CAP_SETGID));
+ // minijail_use_seccomp_filter(j);
+ // minijail_log_seccomp_filter_failures(j);
+ // minijail_parse_seccomp_filters(j, "/data/filter.policy");
minijail_enter(j);
log_resugid();
minijail_destroy(j);
diff --git a/util.c b/util.c
index 49c8a99..c72640a 100644
--- a/util.c
+++ b/util.c
@@ -16,6 +16,7 @@
* These are syscalls used by the syslog() C library call. You can find them
* by running a simple test program. See below for x86_64 behavior:
* $ cat test.c
+ * #include <syslog.h>
* main() { syslog(0, "foo"); }
* $ gcc test.c -static
* $ strace ./a.out
@@ -26,28 +27,34 @@
* exit_group(0) <- finish!
*/
#if defined(__x86_64__)
-const char *log_syscalls[] = { "connect", "sendto" };
+#if defined(__ANDROID__)
+const char *log_syscalls[] = {"socket", "connect", "fcntl", "writev"};
+#elif
+const char *log_syscalls[] = {"connect", "sendto"};
+#endif
#elif defined(__i386__)
#if defined(__ANDROID__)
-const char *log_syscalls[] = { "socketcall", "writev", "fcntl64", "clock_gettime" };
+const char *log_syscalls[] = {"socketcall", "writev", "fcntl64",
+ "clock_gettime"};
#else
-const char *log_syscalls[] = { "socketcall", "time" };
+const char *log_syscalls[] = {"socketcall", "time"};
#endif
#elif defined(__arm__)
#if defined(__ANDROID__)
-const char *log_syscalls[] = { "clock_gettime", "connect", "fcntl64", "socket", "writev" };
+const char *log_syscalls[] = {"clock_gettime", "connect", "fcntl64", "socket",
+ "writev"};
#else
-const char *log_syscalls[] = { "connect", "gettimeofday", "send" };
+const char *log_syscalls[] = {"connect", "gettimeofday", "send"};
#endif
#elif defined(__aarch64__)
#if defined(__ANDROID__)
-const char *log_syscalls[] = { "connect", "fcntl", "sendto", "socket", "writev" };
+const char *log_syscalls[] = {"connect", "fcntl", "sendto", "socket", "writev"};
#else
-const char *log_syscalls[] = { "connect", "send" };
+const char *log_syscalls[] = {"connect", "send"};
#endif
-#elif defined(__powerpc__) || defined(__ia64__) || defined(__hppa__) \
- || defined(__sparc__) || defined(__mips__)
-const char *log_syscalls[] = { "connect", "send" };
+#elif defined(__powerpc__) || defined(__ia64__) || defined(__hppa__) || \
+ defined(__sparc__) || defined(__mips__)
+const char *log_syscalls[] = {"connect", "send"};
#else
#error "Unsupported platform"
#endif
