portable; fix Linux glibc builds, yet even more syscalls; compat miss…

…ing include.
brynet · Mar 30, 2017 · 6bfcd12 · 6bfcd12
1 parent b45120f
commit 6bfcd12
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/compat/imsg.h b/compat/imsg.h
@@ -21,6 +21,8 @@
 #ifndef _IMSG_H_
 #define _IMSG_H_
 
+#include <stdint.h>
+
 #define IBUF_READ_SIZE		65535
 #define IMSG_HEADER_SIZE	sizeof(struct imsg_hdr)
 #define MAX_IMSGSIZE		16384

diff --git a/seccomp-sandbox.c b/seccomp-sandbox.c
@@ -90,6 +90,13 @@ static const struct sock_filter child_insns[] = {
 #ifdef SYS_getpagesize
 	SC_ALLOW(__NR_getpagesize),
 #endif
+	SC_ALLOW(__NR_getpid),
+	/*
+	 * Newer glibc versions do ioctl(.., TCGETS) internally.
+	 * OpenBSD 5.8 replaced isatty(3) with a fcntl(2) implementation
+	 * to avoid ioctl(2) calls for libc stdio.
+	 */
+	SC_DENY(__NR_ioctl, ENOTTY),
 #if defined(SANDBOX_DEBUG)
 #ifdef SYS_lseek
 	SC_ALLOW(__NR_lseek),