August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.3] Fix crash when calling openat with sandbox enabled #25440
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a350f216b30c5841b8eb0303c9c3fd32a2b2245b Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Apr 17 01:31:49 2018 +0100 Fix crash when calling openat with sandbox enabled #25440 The seccomp rule for the openat syscall checks for the AT_FDCWD constant. Because this constant is usually a negative value, a cast to unsigned int is necessary to make sure it does not get converted to uint64_t used by seccomp. More info on: https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980 --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3d27ea66b..0a972d496 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -469,7 +469,7 @@ allow_file_open(scmp_filter_ctx ctx, int use_openat, const char *file) { if (use_openat) { return seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), - SCMP_CMP_STR(0, SCMP_CMP_EQ, AT_FDCWD), + SCMP_CMP(0, SCMP_CMP_EQ, (unsigned int)AT_FDCWD), SCMP_CMP_STR(1, SCMP_CMP_EQ, file)); } else { return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open),

1 0

[tor/maint-0.3.3] Changes file for 25440
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 27a2a6cb9b8a590a88c479539efae7bd31a4102f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:21 2018 -0400 Changes file for 25440 --- changes/bug25440 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug25440 b/changes/bug25440 new file mode 100644 index 000000000..f8d9dd4fa --- /dev/null +++ b/changes/bug25440 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Fix a bug in out sandboxing rules for the openat() syscall. + Previously, no openat() call would be permitted, which would break + filesystem operations on recent glibc versions. Fixes bug 25440; + bugfix on 0.2.9.15. Diagnosis and patch from Daniel Pinto.

1 0

[tor/maint-0.3.4] Changes file for 25440
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 27a2a6cb9b8a590a88c479539efae7bd31a4102f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:21 2018 -0400 Changes file for 25440 --- changes/bug25440 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug25440 b/changes/bug25440 new file mode 100644 index 000000000..f8d9dd4fa --- /dev/null +++ b/changes/bug25440 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Fix a bug in out sandboxing rules for the openat() syscall. + Previously, no openat() call would be permitted, which would break + filesystem operations on recent glibc versions. Fixes bug 25440; + bugfix on 0.2.9.15. Diagnosis and patch from Daniel Pinto.

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb Merge: 4856a6e6c 27a2a6cb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:22 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 00536254b765900127af04f278ed591d562434d9 Merge: 2a6c1585b 8e68fe7e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 00536254b765900127af04f278ed591d562434d9 Merge: 2a6c1585b 8e68fe7e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 8e68fe7e1c84e4ad513cd6b0af686a51c49e55cb Merge: 4856a6e6c 27a2a6cb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:22 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Fix crash when calling openat with sandbox enabled #25440
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a350f216b30c5841b8eb0303c9c3fd32a2b2245b Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Apr 17 01:31:49 2018 +0100 Fix crash when calling openat with sandbox enabled #25440 The seccomp rule for the openat syscall checks for the AT_FDCWD constant. Because this constant is usually a negative value, a cast to unsigned int is necessary to make sure it does not get converted to uint64_t used by seccomp. More info on: https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980 --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3d27ea66b..0a972d496 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -469,7 +469,7 @@ allow_file_open(scmp_filter_ctx ctx, int use_openat, const char *file) { if (use_openat) { return seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), - SCMP_CMP_STR(0, SCMP_CMP_EQ, AT_FDCWD), + SCMP_CMP(0, SCMP_CMP_EQ, (unsigned int)AT_FDCWD), SCMP_CMP_STR(1, SCMP_CMP_EQ, file)); } else { return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open),

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit aaa5ca366e83795f3ec7b35e879a3c8bc4e0b41f Merge: de129e69b 00536254b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug25440 | 5 +++++ src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix crash when calling openat with sandbox enabled #25440
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a350f216b30c5841b8eb0303c9c3fd32a2b2245b Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Apr 17 01:31:49 2018 +0100 Fix crash when calling openat with sandbox enabled #25440 The seccomp rule for the openat syscall checks for the AT_FDCWD constant. Because this constant is usually a negative value, a cast to unsigned int is necessary to make sure it does not get converted to uint64_t used by seccomp. More info on: https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980 --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3d27ea66b..0a972d496 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -469,7 +469,7 @@ allow_file_open(scmp_filter_ctx ctx, int use_openat, const char *file) { if (use_openat) { return seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), - SCMP_CMP_STR(0, SCMP_CMP_EQ, AT_FDCWD), + SCMP_CMP(0, SCMP_CMP_EQ, (unsigned int)AT_FDCWD), SCMP_CMP_STR(1, SCMP_CMP_EQ, file)); } else { return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open),

1 0