From: Cristian Toader <cristian.matei.toader@gmail.com>
Date: Mon, 26 Aug 2013 17:06:46 +0000 (+0300)
Subject: fix: accept4 for 64 bit
X-Git-Tag: tor-0.2.5.1-alpha~39^2~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15d420b564d00891a9a9a388cfb187aff8a89d3b;p=thirdparty%2Ftor.git

fix: accept4 for 64 bit
---

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index e026c7ce3e..79a8930156 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -181,8 +181,23 @@ sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 static int
 sb_accept4(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 {
-  return seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socketcall), 1,
-       SCMP_CMP(0, SCMP_CMP_EQ, 18));
+  int rc = 0;
+
+#ifdef __i386__
+  rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socketcall), 1,
+		  SCMP_CMP(0, SCMP_CMP_EQ, 18));
+  if (rc) {
+    return rc;
+  }
+#endif
+
+  rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(accept4), 1,
+		  SCMP_CMP(3, SCMP_CMP_EQ, SOCK_CLOEXEC));
+  if (rc) {
+    return rc;
+  }
+
+  return 0;
 }
 
 #ifdef __NR_mmap2