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

[tor/master] Merge remote-tracking branch 'public/bug6298'
by nickm＠torproject.org 30 May '17

30 May '17

commit 671c5dcde35d404b53d959f41d52bfdc503a06d6 Merge: 0fbe1a2 159a806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 10:27:37 2017 -0400 Merge remote-tracking branch 'public/bug6298' changes/bug6298 | 4 ++++ src/test/test_addr.c | 24 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 22444: use hardening-wrapper when building gcc for the Linux build
by boklm＠torproject.org 30 May '17

30 May '17

commit 6378afdeb4e15607bedebe5270137657c7961be7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 30 14:51:46 2017 +0200 Bug 22444: use hardening-wrapper when building gcc for the Linux build --- projects/gcc/build | 11 +++++++++++ projects/gcc/config | 2 ++ 2 files changed, 13 insertions(+) diff --git a/projects/gcc/build b/projects/gcc/build index e509aac..e2902ad 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,6 +1,17 @@ #!/bin/sh [% c("var/set_default_env") -%] [% c("var/setarch") -%] +[% IF c("var/linux") -%] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_PIE=1 + # We need to disable `-Werror=format-security` as GCC does not build with it + # anymore. It seems it got audited for those problems already: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. + export DEB_BUILD_HARDENING_FORMAT=0 +[% END -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 diff --git a/projects/gcc/config b/projects/gcc/config index 3871455..d97afbf 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -47,12 +47,14 @@ targets: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib arch_deps: + - hardening-wrapper - libc6-dev - zlib1g-dev linux-x86_64: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 arch_deps: + - hardening-wrapper - libc6-dev-i386 input_files: - project: container-image

1 0

[tor/master] Refactor storage usage reductions into a static function
by nickm＠torproject.org 30 May '17

30 May '17

commit 69b234a0a8250103e44a486c038eb5e11b3128ec Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:21:27 2017 +1000 Refactor storage usage reductions into a static function No behaviour change. Part of #22424. --- src/common/storagedir.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 532fa2a..cc2230d 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -406,6 +406,22 @@ storage_dir_read_labeled(storage_dir_t *dir, return result; } +/* Reduce the cached usage amount in d by removed_file_size. + * This function is a no-op if d->usage_known is 0. */ +static void +storage_dir_reduce_usage(storage_dir_t *d, uint64_t removed_file_size) +{ + if (d->usage_known) { + if (! BUG(d->usage < removed_file_size)) { + /* This bug can also be triggered if an external process resized a file + * between the call to storage_dir_get_usage() that last checked + * actual usage (rather than relaying on cached usage), and the call to + * this function. */ + d->usage -= removed_file_size; + } + } +} + /** * Remove the file called fname from d. */ @@ -425,9 +441,7 @@ storage_dir_remove_file(storage_dir_t *d, } } if (unlink(ipath) == 0) { - if (d->usage_known && ! BUG(d->usage < size)) { - d->usage -= size; - } + storage_dir_reduce_usage(d, size); } else { log_warn(LD_FS, "Unable to unlink %s", escaped(path)); tor_free(path); @@ -506,9 +520,7 @@ storage_dir_shrink(storage_dir_t *d, int idx = 0; while ((d->usage > target_size || min_to_remove > 0) && idx < n) { if (unlink(sandbox_intern_string(ents[idx].path)) == 0) { - if (! BUG(d->usage < ents[idx].size)) { - d->usage -= ents[idx].size; - } + storage_dir_reduce_usage(d, ents[idx].size); --min_to_remove; } ++idx;

1 0

[tor/master] Always check for usage underflow when removing a file in storage.c
by nickm＠torproject.org 30 May '17

30 May '17

commit 9e36b0beb9dc6fe02d43b4c217841c8164f41774 Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:12:09 2017 +1000 Always check for usage underflow when removing a file in storage.c Part of #22424. --- src/common/storagedir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 6457f3d..9140ed2 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -425,7 +425,9 @@ storage_dir_remove_file(storage_dir_t *d, } } if (unlink(ipath) == 0) { - d->usage -= size; + if (! BUG(d->usage < size)) { + d->usage -= size; + } } else { log_warn(LD_FS, "Unable to unlink %s", escaped(path)); tor_free(path);

1 0

[tor/master] Don't underflow usage when it is unknown and a file is removed
by nickm＠torproject.org 30 May '17

30 May '17

commit 334fe6bb6b124c2f3eb1186610999446d57cde76 Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:16:00 2017 +1000 Don't underflow usage when it is unknown and a file is removed Part of #22424. --- src/common/storagedir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 9140ed2..532fa2a 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -425,7 +425,7 @@ storage_dir_remove_file(storage_dir_t *d, } } if (unlink(ipath) == 0) { - if (! BUG(d->usage < size)) { + if (d->usage_known && ! BUG(d->usage < size)) { d->usage -= size; } } else {

1 0

[tor/master] If we do underflow the know usage of a storage, recalculate it
by nickm＠torproject.org 30 May '17

30 May '17

commit 79725289e1f0ed86e2afb37748c83571118d465b Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:28:56 2017 +1000 If we do underflow the know usage of a storage, recalculate it Fixes bug #22424 on 0.3.1.1-alpha. --- src/common/storagedir.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index cc2230d..befcfe6 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -418,6 +418,16 @@ storage_dir_reduce_usage(storage_dir_t *d, uint64_t removed_file_size) * actual usage (rather than relaying on cached usage), and the call to * this function. */ d->usage -= removed_file_size; + } else { + /* If we underflowed the cached directory size, re-check the sizes of all + * the files in the directory. This makes storage_dir_shrink() quadratic, + * but only if a process is continually changing file sizes in the + * storage directory (in which case, we have bigger issues). + * + * We can't just reset usage_known, because storage_dir_shrink() relies + * on knowing the usage. */ + storage_dir_rescan(d); + (void)storage_dir_get_usage(d); } } }

1 0

[tor/master] Merge remote-tracking branch 'teor/bug22424'
by nickm＠torproject.org 30 May '17

30 May '17

commit 0fbe1a2c6f617e04d748ac333bf0dd28e28293c7 Merge: 6bc9ff8 af891e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 30 08:50:45 2017 -0400 Merge remote-tracking branch 'teor/bug22424' changes/bug22424 | 5 +++++ src/common/storagedir.c | 53 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 15 deletions(-)

1 0

[tor/master] Fix comment typos in storage.c
by nickm＠torproject.org 30 May '17

30 May '17

commit f6841ae26374d3b4d0b479049d7a7c237afffe5c Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:11:22 2017 +1000 Fix comment typos in storage.c --- src/common/storagedir.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 309d42d..6457f3d 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -76,8 +76,8 @@ storage_dir_free(storage_dir_t *d) * operations that d will need. * * The presence of this function is why we need an upper limit on the - * number of filers in a storage_dir_t: we need to approve file - * operaitons one by one. + * number of files in a storage_dir_t: we need to approve file operations + * one by one. */ int storage_dir_register_with_sandbox(storage_dir_t *d, sandbox_cfg_t **cfg) @@ -309,9 +309,8 @@ storage_dir_save_string_to_file(storage_dir_t *d, /** * As storage_dir_save_bytes_to_file, but associates the data with the - * key-value pairs in labels. Files - * stored in this format can be recovered with storage_dir_map_labeled - * or storage_dir_read_labeled(). + * key-value pairs in labels. Files stored in this format can be + * recovered with storage_dir_map_labeled() or storage_dir_read_labeled(). */ int storage_dir_save_labeled_to_file(storage_dir_t *d, @@ -356,12 +355,12 @@ storage_dir_save_labeled_to_file(storage_dir_t *d, } /** - * Map a file that was created with storage_dir_save_labeled(). On failure, - * return NULL. On success, write a set of newly allocated labels into to - * *labels_out, a pointer to the into *data_out, and the data's - * into *sz_out. On success, also return a tor_mmap_t object whose - * contents should not be used -- it needs to be kept around, though, for as - * long as data_out is going to be valid. + * Map a file that was created with storage_dir_save_labeled_to_file(). On + * failure, return NULL. On success, write a set of newly allocated labels + * into *labels_out, a pointer to the data into *data_out, and + * the data's size into *sz_out. On success, also return a tor_mmap_t + * object whose contents should not be used -- it needs to be kept around, + * though, for as long as data_out is going to be valid. */ tor_mmap_t * storage_dir_map_labeled(storage_dir_t *dir,

1 0

[tor/master] Changes file for bug 22424
by nickm＠torproject.org 30 May '17

30 May '17

commit af891e7f2ca8185c973805ca620f620a0a3ab8aa Author: teor <teor2345(a)gmail.com> Date: Sun May 28 22:34:56 2017 +1000 Changes file for bug 22424 --- changes/bug22424 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22424 b/changes/bug22424 new file mode 100644 index 0000000..de4cff7 --- /dev/null +++ b/changes/bug22424 @@ -0,0 +1,5 @@ + o Minor bugfixes (storage directories): + - Always check for underflows in the cached storage directory usage amount. + If the usage does underflow, re-calculate the usage. Also, avoid a + separate underflow when the usage is not known. + Fixes bug 22424 in 0.3.1.1-alpha.

1 0

[tor/master] Fix crash with %include
by nickm＠torproject.org 30 May '17

30 May '17

commit f8ccf8d9a9d7203107c55b73eda7473640fa19a9 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Sun May 28 09:53:14 2017 +0100 Fix crash with %include Fixes crash when including a folder that contains a non-empty file without any values followed by any other non-empty file. --- src/common/confline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/confline.c b/src/common/confline.c index f04b7a8..c2122a1 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -300,7 +300,8 @@ config_process_include(const char *path, int recursion_level, int extended, tor_free(config_file); **next = included_list; - *next = &(*list_last)->next; + if (*list_last) + *next = &(*list_last)->next; } SMARTLIST_FOREACH_END(config_file); smartlist_free(config_files);

1 0