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

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit cdb0e6c2522aac372c9a816300dacfd62856dd48 Merge: c0bc30b6f0 dcc60294ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 0c8c295963b5389684d3b41e9260f7fbba4dfe2a Merge: c7502b6503 3b8bf743ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 3b8bf743ae6eca261dd46cde94371a4cca0c0689 Merge: 97d0cb83ed cdb0e6c252 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit fd1bd5bdce6b4b58b2a23f42d71cf663f07ce861 Merge: 8d19118fd2 0c8c295963 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40072 | 4 ++++ src/app/main/main.c | 8 ++++++-- src/lib/sandbox/sandbox.c | 10 +--------- 3 files changed, 11 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.5] Use _lseeki64() on windows.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit cdb0e6c2522aac372c9a816300dacfd62856dd48 Merge: c0bc30b6f0 dcc60294ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.3] Use _lseeki64() on windows.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/maint-0.4.2] Use _lseeki64() on windows.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit cdb0e6c2522aac372c9a816300dacfd62856dd48 Merge: c0bc30b6f0 dcc60294ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.4] Fix startup crash with seccomp sandbox enabled #40072
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit eab8e7af522d18620450003667579eebaa339896 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed Jul 29 00:34:08 2020 +0100 Fix startup crash with seccomp sandbox enabled #40072 Fix crash introduced in #40020. On startup, tor calls check_private_dir on the data and key directories. This function uses open instead of opendir on the received directory. Data and key directoryes are only opened here, so the seccomp rule added should be for open instead of opendir, despite the fact that they are directories. --- src/app/main/main.c | 8 ++++++-- src/lib/sandbox/sandbox.c | 10 +--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index aceba78cfc..3f35d4d23f 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1008,8 +1008,10 @@ sandbox_init_filter(void) OPEN_DATADIR2(name, name2 suffix); \ } while (0) +// KeyDirectory is a directory, but it is only opened in check_private_dir +// which calls open instead of opendir #define OPEN_KEY_DIRECTORY() \ - OPENDIR(options->KeyDirectory) + OPEN(options->KeyDirectory) #define OPEN_CACHEDIR(name) \ sandbox_cfg_allow_open_filename(&cfg, get_cachedir_fname(name)) #define OPEN_CACHEDIR_SUFFIX(name, suffix) do { \ @@ -1023,7 +1025,9 @@ sandbox_init_filter(void) OPEN_KEYDIR(name suffix); \ } while (0) - OPENDIR(options->DataDirectory); + // DataDirectory is a directory, but it is only opened in check_private_dir + // which calls open instead of opendir + OPEN(options->DataDirectory); OPEN_KEY_DIRECTORY(); OPEN_CACHEDIR_SUFFIX("cached-certs", ".tmp"); diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 1903da70e8..2f26c5429b 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -657,15 +657,7 @@ sb_opendir(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (param != NULL && param->prot == 1 && param->syscall == PHONY_OPENDIR_SYSCALL) { - if (libc_uses_openat_for_opendir()) { - rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), - SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD), - SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value), - SCMP_CMP(2, SCMP_CMP_EQ, O_RDONLY|O_NONBLOCK|O_LARGEFILE| - O_DIRECTORY|O_CLOEXEC)); - } else { - rc = allow_file_open(ctx, 0, param->value); - } + rc = allow_file_open(ctx, libc_uses_openat_for_opendir(), param->value); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add openat syscall, received " "libseccomp error %d", rc);

1 0