Commit 24ddf586 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

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

parents f17f7a4f 16d2bce8

changes/bug20247

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/common/sandbox.c

+8 −0
Original line number Diff line number Diff line
@@ -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;

}