Bug 943774 - Allow sigaction when sandboxed, for the crash reporter. …

…r=kang
dothq · Dec 3, 2013 · 6b929fc · 6b929fc
1 parent f844cfd
commit 6b929fc
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/security/sandbox/linux/seccomp_filter.h b/security/sandbox/linux/seccomp_filter.h
@@ -49,29 +49,30 @@
 /* Architecture-specific very infrequently used syscalls */
 #if defined(__arm__)
 #define SECCOMP_WHITELIST_ARCH_LAST \
+  ALLOW_SYSCALL(sigaction), \
+  ALLOW_SYSCALL(rt_sigaction), \
   ALLOW_ARM_SYSCALL(breakpoint), \
   ALLOW_ARM_SYSCALL(cacheflush), \
   ALLOW_ARM_SYSCALL(usr26), \
   ALLOW_ARM_SYSCALL(usr32), \
   ALLOW_ARM_SYSCALL(set_tls),
+#elif defined(__i386__)
+#define SECCOMP_WHITELIST_ARCH_LAST \
+  ALLOW_SYSCALL(sigaction), \
+  ALLOW_SYSCALL(rt_sigaction),
+#elif defined(__x86_64__)
+#define SECCOMP_WHITELIST_ARCH_LAST \
+  ALLOW_SYSCALL(rt_sigaction),
 #else
 #define SECCOMP_WHITELIST_ARCH_LAST
 #endif
 
 /* System calls used by the profiler */
 #ifdef MOZ_PROFILING
-# ifdef __NR_sigaction
-#  define SECCOMP_WHITELIST_PROFILING \
-  ALLOW_SYSCALL(sigaction), \
-  ALLOW_SYSCALL(rt_sigaction), \
-  ALLOW_SYSCALL(tgkill),
-# else
-#  define SECCOMP_WHITELIST_PROFILING \
-  ALLOW_SYSCALL(rt_sigaction), \
+#define SECCOMP_WHITELIST_PROFILING \
   ALLOW_SYSCALL(tgkill),
-# endif
 #else
-# define SECCOMP_WHITELIST_PROFILING
+#define SECCOMP_WHITELIST_PROFILING
 #endif
 
 /* Architecture-specific syscalls that should eventually be removed */