[tor-commits] [tor/master] Avoid assertion failure for state file clock skew

[nickm at torproject.org]

commit ad814cad41a101a3afd03ed0fdc55e2efd696abf
Author: Taylor Yu <catalyst at torproject.org>
Date:   Wed Sep 20 18:47:15 2017 -0500

    Avoid assertion failure for state file clock skew
    
    The clock_skew_warning() refactoring allowed calls from
    or_state_load() to control_event_bootstrap_problem() to occur prior
    bootstrap phase 0, causing an assertion failure.  Initialize the
    bootstrap status prior to calling clock_skew_warning() from
    or_state_load().
---
 changes/bug23607   | 4 ++++
 src/or/statefile.c | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changes/bug23607 b/changes/bug23607
new file mode 100644
index 000000000..7aa48a94c
--- /dev/null
+++ b/changes/bug23607
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bootstrapping):
+    - Avoid an assertion failure when logging a state file clock skew
+      very early in bootstrapping.  Fixes bug 23607; bugfix on
+      0.3.2.1-alpha.
diff --git a/src/or/statefile.c b/src/or/statefile.c
index 86f26419b..2d579a022 100644
--- a/src/or/statefile.c
+++ b/src/or/statefile.c
@@ -34,6 +34,7 @@
 #include "config.h"
 #include "confparse.h"
 #include "connection.h"
+#include "control.h"
 #include "entrynodes.h"
 #include "hibernate.h"
 #include "rephist.h"
@@ -405,9 +406,14 @@ or_state_load(void)
     /* Warn the user if their clock has been set backwards,
      * they could be tricked into using old consensuses */
     time_t apparent_skew = time(NULL) - new_state->LastWritten;
-    if (apparent_skew < 0)
+    if (apparent_skew < 0) {
+      /* Initialize bootstrap event reporting because we might call
+       * clock_skew_warning() before the bootstrap state is
+       * initialized, causing an asserttion failure. */
+      control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0);
       clock_skew_warning(NULL, (long)apparent_skew, 1, LD_GENERAL,
                          "local state file", fname);
+    }
   } else {
     log_info(LD_GENERAL, "Initialized state");
   }