From: Nick Mathewson Date: Thu, 29 May 2014 15:04:32 +0000 (-0400) Subject: sandbox: allow enough setsockopt to make ConstrainedSockets work X-Git-Tag: tor-0.2.5.5-alpha~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6688f9cbb930ad139a7f3886684fcadeec59d30;p=thirdparty%2Ftor.git sandbox: allow enough setsockopt to make ConstrainedSockets work fixes bug 12139; bugfix on 0.2.5.1-alpha --- diff --git a/changes/bug12139 b/changes/bug12139 new file mode 100644 index 0000000000..8d31dab2ca --- /dev/null +++ b/changes/bug12139 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp sandbox): + - Avoid crashing with the seccomp sandbox enabled along with + ConstrainedSockets. Fixes bug 12139; bugfix on 0.2.5.1-alpha. + diff --git a/src/common/sandbox.c b/src/common/sandbox.c index ba1956b144..c379151b31 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -587,6 +587,18 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (rc) return rc; + rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), + SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET), + SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUF)); + if (rc) + return rc; + + rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), + SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET), + SCMP_CMP(2, SCMP_CMP_EQ, SO_RCVBUF)); + if (rc) + return rc; + #ifdef IP_TRANSPARENT rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),