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

[tor/master] Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 31a08ba26fc5eaa12de6d3c5efa3aac4d00509d0 Merge: 0ac8f0b 5537e1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 11:34:06 2017 -0400 Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1 changes/bug22670 | 4 + changes/bug22670_02 | 4 + changes/bug22670_03 | 6 ++ src/or/directory.c | 205 +++++++++++++++++++++++++++++++--------------------- 4 files changed, 135 insertions(+), 84 deletions(-)

1 0

[tor/master] Log real error message when unable to remove a storagedir file
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a088a08eeb076a80dfe3392bf913a955ac1bd4e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:24:27 2017 -0400 Log real error message when unable to remove a storagedir file Attempts to help diagnose 22752. --- src/common/storagedir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 4405731..31933f6 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -119,7 +119,8 @@ storage_dir_clean_tmpfiles(storage_dir_t *d) char *path = NULL; tor_asprintf(&path, "%s/%s", d->directory, fname); if (unlink(sandbox_intern_string(path))) { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while cleaning " + "temporary files: %s", escaped(path), strerror(errno)); tor_free(path); continue; } @@ -455,7 +456,8 @@ storage_dir_remove_file(storage_dir_t *d, if (unlink(ipath) == 0) { storage_dir_reduce_usage(d, size); } else { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while removing file: %s", + escaped(path), strerror(errno)); tor_free(path); return; }

1 0

[tor/master] Replace crash on missing handle in consdiffmgr with nonfatal assert
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit de5f0d8ba7156e9579cc52898cbe0b3a25f64aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:21:21 2017 -0400 Replace crash on missing handle in consdiffmgr with nonfatal assert Attempts to mitigate 22752. --- src/or/consdiffmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 4036f66..638fcd6 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -325,7 +325,8 @@ cdm_diff_ht_purge(consensus_flavor_t flav, if ((*diff)->cdm_diff_status == CDM_DIFF_PRESENT && flav == (*diff)->flavor) { - if (consensus_cache_entry_handle_get((*diff)->entry) == NULL) { + if (BUG((*diff)->entry == NULL) || + consensus_cache_entry_handle_get((*diff)->entry) == NULL) { /* the underlying entry has gone away; drop this. */ next = HT_NEXT_RMV(cdm_diff_ht, &cdm_diff_ht, diff); cdm_diff_free(this); @@ -622,6 +623,9 @@ consdiffmgr_find_diff_from(consensus_cache_entry_t **entry_out, return CONSDIFF_IN_PROGRESS; } + if (BUG(ent->entry == NULL)) { + return CONSDIFF_NOT_FOUND; + } *entry_out = consensus_cache_entry_handle_get(ent->entry); return (*entry_out) ? CONSDIFF_AVAILABLE : CONSDIFF_NOT_FOUND;

1 0

[tor/maint-0.3.1] Replace crash on missing handle in consdiffmgr with nonfatal assert
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit de5f0d8ba7156e9579cc52898cbe0b3a25f64aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:21:21 2017 -0400 Replace crash on missing handle in consdiffmgr with nonfatal assert Attempts to mitigate 22752. --- src/or/consdiffmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 4036f66..638fcd6 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -325,7 +325,8 @@ cdm_diff_ht_purge(consensus_flavor_t flav, if ((*diff)->cdm_diff_status == CDM_DIFF_PRESENT && flav == (*diff)->flavor) { - if (consensus_cache_entry_handle_get((*diff)->entry) == NULL) { + if (BUG((*diff)->entry == NULL) || + consensus_cache_entry_handle_get((*diff)->entry) == NULL) { /* the underlying entry has gone away; drop this. */ next = HT_NEXT_RMV(cdm_diff_ht, &cdm_diff_ht, diff); cdm_diff_free(this); @@ -622,6 +623,9 @@ consdiffmgr_find_diff_from(consensus_cache_entry_t **entry_out, return CONSDIFF_IN_PROGRESS; } + if (BUG(ent->entry == NULL)) { + return CONSDIFF_NOT_FOUND; + } *entry_out = consensus_cache_entry_handle_get(ent->entry); return (*entry_out) ? CONSDIFF_AVAILABLE : CONSDIFF_NOT_FOUND;

1 0

[tor/maint-0.3.1] Log real error message when unable to remove a storagedir file
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a088a08eeb076a80dfe3392bf913a955ac1bd4e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:24:27 2017 -0400 Log real error message when unable to remove a storagedir file Attempts to help diagnose 22752. --- src/common/storagedir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 4405731..31933f6 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -119,7 +119,8 @@ storage_dir_clean_tmpfiles(storage_dir_t *d) char *path = NULL; tor_asprintf(&path, "%s/%s", d->directory, fname); if (unlink(sandbox_intern_string(path))) { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while cleaning " + "temporary files: %s", escaped(path), strerror(errno)); tor_free(path); continue; } @@ -455,7 +456,8 @@ storage_dir_remove_file(storage_dir_t *d, if (unlink(ipath) == 0) { storage_dir_reduce_usage(d, size); } else { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while removing file: %s", + escaped(path), strerror(errno)); tor_free(path); return; }

1 0

[tor/maint-0.3.1] Changes file for bug22752 diagnostics
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 0ac8f0bde92ef60d8863bbbcae42a6dc7c726b01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:27:52 2017 -0400 Changes file for bug22752 diagnostics --- changes/diagnose_22752 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/diagnose_22752 b/changes/diagnose_22752 new file mode 100644 index 0000000..b5bda05 --- /dev/null +++ b/changes/diagnose_22752 @@ -0,0 +1,4 @@ + o Minor features (bug mitigation, diagnostics, logging): + - Avoid an assertion failure, and log a better error message, + when unable to remove a file from the consensus cache on + Windows. Attempts to mitigate and diagnose bug 22752.

1 0

[tor/master] Changes file for bug22752 diagnostics
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 0ac8f0bde92ef60d8863bbbcae42a6dc7c726b01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:27:52 2017 -0400 Changes file for bug22752 diagnostics --- changes/diagnose_22752 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/diagnose_22752 b/changes/diagnose_22752 new file mode 100644 index 0000000..b5bda05 --- /dev/null +++ b/changes/diagnose_22752 @@ -0,0 +1,4 @@ + o Minor features (bug mitigation, diagnostics, logging): + - Avoid an assertion failure, and log a better error message, + when unable to remove a file from the consensus cache on + Windows. Attempts to mitigate and diagnose bug 22752.

1 0

[tor/release-0.3.1] Changes file for bug22752 diagnostics
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 0ac8f0bde92ef60d8863bbbcae42a6dc7c726b01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:27:52 2017 -0400 Changes file for bug22752 diagnostics --- changes/diagnose_22752 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/diagnose_22752 b/changes/diagnose_22752 new file mode 100644 index 0000000..b5bda05 --- /dev/null +++ b/changes/diagnose_22752 @@ -0,0 +1,4 @@ + o Minor features (bug mitigation, diagnostics, logging): + - Avoid an assertion failure, and log a better error message, + when unable to remove a file from the consensus cache on + Windows. Attempts to mitigate and diagnose bug 22752.

1 0

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

29 Jun '17

commit 2c718c1a12f06bdaa9c735a8d201c20b7ca4cfac Merge: bb5968c 0ac8f0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 10:43:50 2017 -0400 Merge branch 'maint-0.3.1' changes/diagnose_22752 | 4 ++++ src/common/storagedir.c | 6 ++++-- src/or/consdiffmgr.c | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Log real error message when unable to remove a storagedir file
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a088a08eeb076a80dfe3392bf913a955ac1bd4e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 28 14:24:27 2017 -0400 Log real error message when unable to remove a storagedir file Attempts to help diagnose 22752. --- src/common/storagedir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 4405731..31933f6 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -119,7 +119,8 @@ storage_dir_clean_tmpfiles(storage_dir_t *d) char *path = NULL; tor_asprintf(&path, "%s/%s", d->directory, fname); if (unlink(sandbox_intern_string(path))) { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while cleaning " + "temporary files: %s", escaped(path), strerror(errno)); tor_free(path); continue; } @@ -455,7 +456,8 @@ storage_dir_remove_file(storage_dir_t *d, if (unlink(ipath) == 0) { storage_dir_reduce_usage(d, size); } else { - log_warn(LD_FS, "Unable to unlink %s", escaped(path)); + log_warn(LD_FS, "Unable to unlink %s while removing file: %s", + escaped(path), strerror(errno)); tor_free(path); return; }

1 0