This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from ce1675ef65 Merge branch 'tor-gitlab/mr/601' new dc13936f20 relay: Use remote reason when sending back a DESTROY new 8e7bd96362 Fix a check, make a netflow padding function more safe. new 691e542fd5 Merge branch 'tor-gitlab/mr/605' into maint-0.4.5 new e618a7e445 Merge branch 'maint-0.4.5' into maint-0.4.6 new 7654e12be8 Merge branch 'maint-0.4.6' into maint-0.4.7 new 22cb4c23d0 Merge branch 'maint-0.4.7'
The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- src/core/or/command.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changes/bug40645
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit dc13936f20e6263a099f40d32a274847e8384f96 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jul 27 08:32:01 2022 -0400
relay: Use remote reason when sending back a DESTROY
Fix from previous commit where a DESTROY cell is sent instead of a TRUNCATED.
Related to #40623
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/or/command.c b/src/core/or/command.c index 6ddfc317d6..65853f7844 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -641,7 +641,7 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan) * DESTROY cell down the circuit so relays can stop queuing in-flight * cells for this circuit which helps with memory pressure. */ log_debug(LD_OR, "Received DESTROY cell from n_chan, closing circuit."); - circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + circuit_mark_for_close(circ, reason | END_CIRC_REASON_FLAG_REMOTE); } } }
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 8e7bd9636260af3e31997e2ad5ec071c4e7a0153 Author: Nick Mathewson nickm@torproject.org AuthorDate: Wed Jul 27 09:16:50 2022 -0400
Fix a check, make a netflow padding function more safe.
Previously, `channelpadding_get_netflow_inactive_timeout_ms` would crash with an assertion failure if `low_timeout` was greater than `high_timeout`. That wasn't possible in practice because of checks in `channelpadding_update_padding_for_channel`, but it's better not to have a function whose correctness is this tricky to prove.
Fixes #40645. Bugfix on 0.3.1.1-alpha. --- changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug40645 b/changes/bug40645 new file mode 100644 index 0000000000..044d5b67d2 --- /dev/null +++ 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 index d0c43e8bdc..d4c19491ac 100644 --- 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
/*
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 691e542fd520edb8a1371eb42fa7b11b296616b9 Merge: dc13936f20 8e7bd96362 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jul 27 11:33:16 2022 -0400
Merge branch 'tor-gitlab/mr/605' into maint-0.4.5
changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit e618a7e4456ae6a1bcb96d8d5f2c972796dd515a Merge: 5260b4ef34 691e542fd5 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jul 27 11:33:19 2022 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- src/core/or/command.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 7654e12be8d8179505add9a7fe381899f73e1aaf Merge: e98995bb08 e618a7e445 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jul 27 11:33:19 2022 -0400
Merge branch 'maint-0.4.6' into maint-0.4.7
changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- src/core/or/command.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 22cb4c23d0d23dfda2c91817bac74a01831f94af Merge: ce1675ef65 7654e12be8 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jul 27 11:33:19 2022 -0400
Merge branch 'maint-0.4.7'
changes/bug40645 | 5 +++++ src/core/or/channelpadding.c | 2 +- src/core/or/command.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
tor-commits@lists.torproject.org
-
gitolite role