tor

commit 691e542fd520edb8a1371eb42fa7b11b296616b9
parent dc13936f20e6263a099f40d32a274847e8384f96
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 27 Jul 2022 11:33:16 -0400

Merge branch 'tor-gitlab/mr/605' into maint-0.4.5

Diffstat:
A
changes/bug40645
 | 
5
+++++
M
src/core/or/channelpadding.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug40645 b/changes/bug40645
@@ -0,0 +1,5 @@
+  o Minor bugfixes (defense in depth):
+    - Change a test in the netflow padding code to make it more
+      _obviously_ safe against remotely triggered crashes.
+      (It was safe against these before, but not obviously so.)
+      Fixes bug 40645; bugfix on 0.3.1.1-alpha.
diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c
@@ -186,7 +186,7 @@ channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan)
     high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms);
   }
 
-  if (low_timeout == high_timeout)
+  if (low_timeout >= high_timeout)
     return low_timeout; // No randomization
 
   /*