Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nick Mathewson
Tor
Commits
501b5174
Unverified
Commit
501b5174
authored
Nov 25, 2019
by
teor
Browse files
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
parents
400cee26
ed57a04a
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/ticket28970
0 → 100644
View file @
501b5174
o Minor bugfixes (clietn, hidden service v3):
- Fix a BUG() assertion that occurs within a very small race window between
a client intro circuit opens and its descriptor that gets cleaned up from
the cache. The circuit is now closed which will trigger a re-fetch of the
descriptor and continue the HS connection. Fixes bug 28970; bugfix on
0.3.2.1-alpha.
src/feature/hs/hs_client.c
View file @
501b5174
...
...
@@ -672,8 +672,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ)
tor_assert
(
circ
);
desc
=
hs_cache_lookup_as_client
(
&
circ
->
hs_ident
->
identity_pk
);
if
(
BUG
(
desc
==
NULL
))
{
/* Opening intro circuit without the descriptor is no good... */
if
(
desc
==
NULL
)
{
/* There is a very small race window between the opening of this circuit
* and the client descriptor cache that gets purged (NEWNYM) or the
* cleaned up because it expired. Mark the circuit for close so a new
* descriptor fetch can occur. */
circuit_mark_for_close
(
TO_CIRCUIT
(
circ
),
END_CIRC_REASON_INTERNAL
);
goto
end
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment