tor

commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f
parent f17f7a4fdf1037a2cabe7c766231da244e30e692
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 27 Jul 2017 08:23:34 -0400

Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9

Diffstat:
A
changes/bug20247
 | 
4
++++
M
src/common/sandbox.c
 | 
8
++++++++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/changes/bug20247 b/changes/bug20247
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp2 sandbox):
+    - Avoid a sandbox failure when trying to re-bind to a socket and mark
+      it as IPv6-only. Fixes bug 20247; bugfix on 0.2.5.1-alpha.
+
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
@@ -728,6 +728,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
     return rc;
 #endif
 
+#ifdef IPV6_V6ONLY
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
+      SCMP_CMP(1, SCMP_CMP_EQ, IPPROTO_IPV6),
+      SCMP_CMP(2, SCMP_CMP_EQ, IPV6_V6ONLY));
+  if (rc)
+    return rc;
+#endif
+
   return 0;
 }