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

[tor/release-0.3.1] Use a single free-and-exit strategy in config_process_include.
by nickm＠torproject.org 11 Aug '17

11 Aug '17

commit 72832086e2144158308b30133aa15b39f0d2eb5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 20:07:39 2017 -0400 Use a single free-and-exit strategy in config_process_include. This avoids a double-free when a pointer already freed with tor_free(config_line) is freed again in the cleanup-and-exit code. Fixes bug 23155. --- changes/bug23155 | 4 ++++ src/common/confline.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/changes/bug23155 b/changes/bug23155 new file mode 100644 index 000000000..4c24ab136 --- /dev/null +++ b/changes/bug23155 @@ -0,0 +1,4 @@ + o Minor bugfixes (stability): + - Avoid crashing on double-free when unable to load or process + an included file. Fixes bug 23155; bugfix on 0.3.1.1-alpha. + Found with the clang static analyzer. diff --git a/src/common/confline.c b/src/common/confline.c index 691cbf8c6..15fd96bf3 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -294,24 +294,26 @@ config_process_include(const char *path, int recursion_level, int extended, return -1; } - SMARTLIST_FOREACH_BEGIN(config_files, char *, config_file) { + int rv = -1; + SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) { config_line_t *included_list = NULL; if (config_get_included_list(config_file, recursion_level, extended, &included_list, list_last) < 0) { - SMARTLIST_FOREACH(config_files, char *, f, tor_free(f)); - smartlist_free(config_files); - return -1; + goto done; } - tor_free(config_file); *next = included_list; if (*list_last) next = &(*list_last)->next; } SMARTLIST_FOREACH_END(config_file); - smartlist_free(config_files); *list = ret_list; - return 0; + rv = 0; + + done: + SMARTLIST_FOREACH(config_files, char *, f, tor_free(f)); + smartlist_free(config_files); + return rv; } /**

1 0

[tor/master] Use a single free-and-exit strategy in config_process_include.
by nickm＠torproject.org 11 Aug '17

11 Aug '17

commit 72832086e2144158308b30133aa15b39f0d2eb5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 8 20:07:39 2017 -0400 Use a single free-and-exit strategy in config_process_include. This avoids a double-free when a pointer already freed with tor_free(config_line) is freed again in the cleanup-and-exit code. Fixes bug 23155. --- changes/bug23155 | 4 ++++ src/common/confline.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/changes/bug23155 b/changes/bug23155 new file mode 100644 index 000000000..4c24ab136 --- /dev/null +++ b/changes/bug23155 @@ -0,0 +1,4 @@ + o Minor bugfixes (stability): + - Avoid crashing on double-free when unable to load or process + an included file. Fixes bug 23155; bugfix on 0.3.1.1-alpha. + Found with the clang static analyzer. diff --git a/src/common/confline.c b/src/common/confline.c index 691cbf8c6..15fd96bf3 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -294,24 +294,26 @@ config_process_include(const char *path, int recursion_level, int extended, return -1; } - SMARTLIST_FOREACH_BEGIN(config_files, char *, config_file) { + int rv = -1; + SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) { config_line_t *included_list = NULL; if (config_get_included_list(config_file, recursion_level, extended, &included_list, list_last) < 0) { - SMARTLIST_FOREACH(config_files, char *, f, tor_free(f)); - smartlist_free(config_files); - return -1; + goto done; } - tor_free(config_file); *next = included_list; if (*list_last) next = &(*list_last)->next; } SMARTLIST_FOREACH_END(config_file); - smartlist_free(config_files); *list = ret_list; - return 0; + rv = 0; + + done: + SMARTLIST_FOREACH(config_files, char *, f, tor_free(f)); + smartlist_free(config_files); + return rv; } /**

1 0

[tor/master] Fix check_expired_networkstatus_callback() if condition
by nickm＠torproject.org 11 Aug '17

11 Aug '17

commit 5b03c7ba6d899e19e8f3e0a58bd5df8bb7bbf1d0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 2 13:20:59 2017 -0400 Fix check_expired_networkstatus_callback() if condition The condition was always true meaning that we would reconsider updating our directory information every 2 minutes. If valid_until is 6am today, then now - 24h == 1pm yesterday which means that "valid_until < (now - 24h)" is false. But at 6:01am tomorrow, "valid_until < (now - 24h)" becomes true which is that point that we shouldn't trust the consensus anymore. Fixes #23091 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23091 | 6 ++++++ src/or/main.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug23091 b/changes/bug23091 new file mode 100644 index 000000000..7dfb7e418 --- /dev/null +++ b/changes/bug23091 @@ -0,0 +1,6 @@ + o Minor bugfixes (consensus expiry): + - Tor would reconsider updating its directory information every 2 minutes + instead of only doing it for a consensus that is more than 24 hours old + (badly expired). This specific check is done in the tor main loop + callback that validates if we have an expired consensus. Fixes bug + 23091; bugfix on tor-0.2.0.19-alpha. diff --git a/src/or/main.c b/src/or/main.c index dc2318496..670d67cda 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1713,7 +1713,7 @@ check_expired_networkstatus_callback(time_t now, const or_options_t *options) * networkstatus_get_reasonably_live_consensus(), but that value is way * way too high. Arma: is the bridge issue there resolved yet? -NM */ #define NS_EXPIRY_SLOP (24*60*60) - if (ns && ns->valid_until < now+NS_EXPIRY_SLOP && + if (ns && ns->valid_until < (now - NS_EXPIRY_SLOP) && router_have_minimum_dir_info()) { router_dir_info_changed(); }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug23091_032_01'
by nickm＠torproject.org 11 Aug '17

11 Aug '17

commit 133e1e870bd59e3a89d5a7712983d3f9bf35f7c3 Merge: 77bb85ba8 5b03c7ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 11 09:39:57 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23091_032_01' changes/bug23091 | 6 ++++++ src/or/main.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Update rbm for the build_log_append option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 89656909bd3d54722aa6ee1627b93858c5cdd93c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 13:02:32 2017 +0200 Update rbm for the build_log_append option --- rbm | 2 +- rbm.local.conf.example | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rbm b/rbm index 6902007..0f5857b 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 690200770631f4adcfbbe7988379eb39698e11ab +Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c diff --git a/rbm.local.conf.example b/rbm.local.conf.example index e30d8a8..62d13b2 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -21,6 +21,11 @@ ### stdout and stderr. #build_log: '-' +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + buildconf: buildconf: 1

1 0

[rbm/master] Add the build_log_append option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:56:25 2017 +0200 Add the build_log_append option --- NEWS | 2 ++ doc/rbm_config.asc | 5 +++++ lib/RBM.pm | 3 ++- lib/RBM/DefaultConfig.pm | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c43dc2d..d517840 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the build_log_append option + - Add the rbm_tmp_dir option - Add the input_files_paths option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index dc3b5e4..1935cd3 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -149,6 +149,11 @@ build_log:: The file where the build logs will be written. If the value is `-` (the default), the logs will be output on stdout and stderr. +build_log_append:: + If you set to +build_log_append+ to 0, the log file (defined in + +build_log+) will be cleaned when starting a new build. The + default is 1. + fetch:: The value should be 0 or 1, depending on whether the commits from the remote git or hg repository should be fetched diff --git a/lib/RBM.pm b/lib/RBM.pm index c1240cd..df29a01 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1020,10 +1020,11 @@ sub build_run { } my $build_log = project_config($project, "build_log", $options); if ($build_log ne '-') { + my $append = project_config($project, "build_log_append", $options); $build_log = path($build_log); make_path(dirname($build_log)); my $now = localtime; - write_file($build_log, {append => 1}, "Starting build: $now\n"); + write_file($build_log, {append => $append}, "Starting build: $now\n"); print "Build log: $build_log\n"; } chdir $srcdir; diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 63021e9..b1f97cb 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -126,6 +126,7 @@ our %default_config = ( rpmspec => '[% SET tmpl = project _ ".spec"; INCLUDE $tmpl -%]', build => '[% INCLUDE build -%]', build_log => '-', + build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, abbrev_lenght => '12',

1 0

[tor-browser-build/master] Avoid using directory with predictable name in /tmp
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 36296855fd4e553fb871c2f03a2fc62597d562a5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:28:57 2017 +0200 Avoid using directory with predictable name in /tmp Update rbm with support for the rbm_tmp_dir option, and use it in the containers directory. --- rbm | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index f494d16..6902007 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1 +Subproject commit 690200770631f4adcfbbe7988379eb39698e11ab diff --git a/rbm.conf b/rbm.conf index 93c5e5b..5e1e66d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -36,7 +36,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Display container's path when opening debug shell
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit b9512ca6c0fddee7aa61e6c1672df59ddaa0aacc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:22:54 2017 +0200 Display container's path when opening debug shell --- README.HACKING | 5 ++--- rbm.conf | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.HACKING b/README.HACKING index 8dde2f2..ea5d500 100644 --- a/README.HACKING +++ b/README.HACKING @@ -256,7 +256,6 @@ in the build containers, but vi can be used instead. When you press ctrl+d (twice if you opened a bash shell) the debug shell is closed and the container containing the failed build is removed. -If you want to make a backup of the container's rootfs with the failed -build to look at it later, you should be able to find it in -/tmp/$UID/rbm-containers. +The path to the container should be printed on the screen in case you +want to backup its rootfs to be able to look at it later. diff --git a/rbm.conf b/rbm.conf index 523a005..93c5e5b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -314,6 +314,9 @@ runc: remote_exec: | #!/bin/sh set -e + [% IF c("interactive") -%] + echo Container directory: [% shell_quote(c("var/container/dir")) %] + [% END -%] mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/rbm echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/cmd echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rootfs/rbm/cmd

1 0

[rbm/master] Add the rbm_tmp_dir option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 690200770631f4adcfbbe7988379eb39698e11ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:25:55 2017 +0200 Add the rbm_tmp_dir option --- NEWS | 2 ++ doc/rbm_config.asc | 5 +++++ lib/RBM/DefaultConfig.pm | 13 +++++++++++++ 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index 4eac374..c43dc2d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the rbm_tmp_dir option + - Add the input_files_paths option - Add the ENV option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 2e9b8ab..dc3b5e4 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -136,6 +136,11 @@ tmp_dir:: This directory will contains some scripts that will be executed, so it should not be on a partition mounted as noexec. +rbm_tmp_dir:: + A directory created inside +tmp_dir+ using +File::Temp+, that + you can use to store temporary files. This directory is removed + automatically when rbm exits. + output_dir:: The directory where output files (tarballs, spec files or packages) are created. The default value is +out+. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index cf0ed74..63021e9 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -13,6 +13,7 @@ use File::Basename; use RBM; use Cwd qw(getcwd); use IO::CaptureOutput qw(capture_exec); +use File::Temp; sub git_describe { my ($project, $options) = @_; @@ -101,10 +102,22 @@ sub docker_version { RBM::exit_error("Could not find docker version"); } +sub rbm_tmp_dir { + my ($project, $options) = @_; + CORE::state $rbm_tmp_dir; + return $rbm_tmp_dir->dirname if $rbm_tmp_dir; + my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) + || RBM::exit_error('No tmp_dir specified'); + $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', + DIR => $tmp_dir); + return $rbm_tmp_dir->dirname; +} + our %default_config = ( sysconf_file => '/etc/rbm.conf', localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', + rbm_tmp_dir => \&rbm_tmp_dir, projects_dir => 'projects', output_dir => 'out', git_clone_dir => 'git_clones',

1 0

[webwml/master] Remove deprecated Tor Browser versions
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 52c29243a398db421d9ed543af831dc13490ec64 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 11:19:58 2017 +0200 Remove deprecated Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 5944b1cc..fdf796fe 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,18 +1,8 @@ [ -"7.0.2", -"7.0.2-MacOS", -"7.0.2-Windows", -"7.0.3", -"7.0.3-Linux", "7.0.4", "7.0.4-MacOS", "7.0.4-Windows", "7.0.4-Linux", -"7.5a2", -"7.5a2-MacOS", -"7.5a2-Windows", -"7.5a3", -"7.5a3-Linux", "7.5a4", "7.5a4-MacOS", "7.5a4-Windows",

1 0