July 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Allow setsockopt(IPV6_V6ONLY) in sandbox.
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 16d2bce89310d68804bacabf5e87a90e8f7322af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:09:21 2017 -0400 Allow setsockopt(IPV6_V6ONLY) in sandbox. Fixes bug 20247. We started setting V6ONLY in 0.2.3.13-alpha and added the sandbox on 0.2.5.1-alpha. --- changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug20247 b/changes/bug20247 new file mode 100644 index 000000000..731cf0046 --- /dev/null +++ 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 index da96ad824..7f4511db2 100644 --- 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; }

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit b858f22c554f1c5e37794d851d76052112af210f Merge: a76315be5 24ddf5862 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:36 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f Merge: f17f7a4fd 16d2bce89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:34 2017 -0400 Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f Merge: f17f7a4fd 16d2bce89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:34 2017 -0400 Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit b387dd364f44ff79aff7c4c71a3bff9dd21b1623 Merge: 836d628fc ced2dd5f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:37 2017 -0400 Merge branch 'maint-0.3.1' changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f Merge: f17f7a4fd 16d2bce89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:34 2017 -0400 Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit ad35e595e5070b16ad034315b5082d734f71f181 Merge: 7021d33b9 24ddf5862 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:36 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 388ed4c815ebfc178fc67c5decbdc6246dbde6e5 Merge: ef1d93975 ad35e595e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:36 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 24ddf5862e8582a903860a8fe4a1b4a63153f40f Merge: f17f7a4fd 16d2bce89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 08:23:34 2017 -0400 Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/release-0.3.1] Allow setsockopt(IPV6_V6ONLY) in sandbox.
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 16d2bce89310d68804bacabf5e87a90e8f7322af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:09:21 2017 -0400 Allow setsockopt(IPV6_V6ONLY) in sandbox. Fixes bug 20247. We started setting V6ONLY in 0.2.3.13-alpha and added the sandbox on 0.2.5.1-alpha. --- changes/bug20247 | 4 ++++ src/common/sandbox.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug20247 b/changes/bug20247 new file mode 100644 index 000000000..731cf0046 --- /dev/null +++ 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 index da96ad824..7f4511db2 100644 --- 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; }

1 0