From: Mike Perry <mikeperry-git@torproject.org>
Date: Fri, 9 Jun 2023 15:52:42 +0000 (+0000)
Subject: Bug 40801: Do not change read state of marked conns
X-Git-Tag: tor-0.4.8.2-alpha~15^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a513e2ff57545ad232ff8931b8902421b89c09b;p=thirdparty%2Ftor.git

Bug 40801: Do not change read state of marked conns
---

diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 247024ebc7..2c722f01cc 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -3081,9 +3081,9 @@ set_block_state_for_streams(circuit_t *circ, edge_connection_t *stream_list,
     if (stream_id && edge->stream_id != stream_id)
       continue;
 
-    if (!conn->read_event || edge->xoff_received) {
-      /* This connection is a placeholder for something; probably a DNS
-       * request.  It can't actually stop or start reading.*/
+    if (!conn->read_event || edge->xoff_received ||
+        conn->marked_for_close) {
+      /* This connection should not start or stop reading. */
       continue;
     }