tor

commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1
parent efca9ce41c96bb0044f504ced36a2734b1689ee2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 15 Mar 2021 08:58:54 -0400

Merge branch 'bug40316_035_v2' into maint-0.3.5

Diffstat:
A
changes/bug40316
 | 
5
+++++
M
src/feature/dirauth/dirvote.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug40316 b/changes/bug40316
@@ -0,0 +1,5 @@
+  o Major bugfixes (security, denial of service):
+    - Fix a bug in appending detached signatures to a pending consensus
+      document that could be used to crash a directory authority.
+      Fixes bug 40316; bugfix on 0.2.2.6-alpha. Tracked as
+      TROVE-2021-002 and CVE-2021-28090.
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
@@ -3520,7 +3520,7 @@ dirvote_add_signatures_to_pending_consensus(
       strlen(pc->body) + strlen(new_signatures) + 1;
     pc->body = tor_realloc(pc->body, new_consensus_len);
     dst_end = pc->body + new_consensus_len;
-    dst = strstr(pc->body, "directory-signature ");
+    dst = (char *) find_str_at_start_of_line(pc->body, "directory-signature ");
     tor_assert(dst);
     strlcpy(dst, new_signatures, dst_end-dst);