From d3dadf51afa90f96c9df4e3247763b714b0d9c41 Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Sun, 29 Oct 2023 18:14:13 +0100 Subject: [PATCH 1/2] correctly parse consensus params for dos stream mitigation --- src/core/or/dos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/or/dos.c b/src/core/or/dos.c index 632a49888d..b789f87aae 100644 --- a/src/core/or/dos.c +++ b/src/core/or/dos.c @@ -357,9 +357,9 @@ set_dos_parameters(const networkstatus_t *ns) /* Stream. */ dos_stream_enabled = get_param_stream_enabled(ns); - dos_stream_defense_type = get_param_stream_rate(ns); - dos_stream_rate = get_param_stream_burst(ns); - dos_stream_burst = get_param_stream_defense_type(ns); + dos_stream_defense_type = get_param_stream_defense_type(ns); + dos_stream_rate = get_param_stream_rate(ns); + dos_stream_burst = get_param_stream_burst(ns); } /* Free everything for the circuit creation DoS mitigation subsystem. */ From 798fe6c5ed220fda4d171ed5a051311b23287832 Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Sun, 29 Oct 2023 19:16:49 +0100 Subject: [PATCH 2/2] fix memory leak in dos stream for resolve requests --- src/core/or/connection_edge.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index fd758be75d..b36d0d9013 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -4234,8 +4234,10 @@ connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ) break; case DOS_STREAM_DEFENSE_REFUSE_STREAM: dns_send_resolved_error_cell(dummy_conn, RESOLVED_TYPE_ERROR_TRANSIENT); + connection_free_(TO_CONN(dummy_conn)); return 0; case DOS_STREAM_DEFENSE_CLOSE_CIRCUIT: + connection_free_(TO_CONN(dummy_conn)); return -END_CIRC_REASON_RESOURCELIMIT; }