addrman: don't overwrite addr_info when resetting I2P ports #22468
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In `CAddrMan::ResetI2PPorts()` we copy `addr_info` to `addr_info_newport`, change the `port` in the latter and eventually, if necessary, we overwrite `addr_info` with `addr_info_newport`. The problem is that after creating the copy, `addr_info.nRandomPos` may be changed by `ClearNew() -> Delete() -> SwapRandom()`. Later, overwriting the entire `addr_info` with the stale `addr_info_newport` would restore the previous/stale `nRandomPos`. To fix that change just the port in `addr_info`. Fixes bitcoin#22467
It is not necessary to have a separate variable `addr_info_newport`, we can directly change the port in `addr_info`.
This was referenced Jul 16, 2021
|
Still fuzzing with your last three pulls cherry-picked together + running on mainnet with DEBUG_ADDRMAN. |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
|
Closing now that #22497 has been merged. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
CAddrMan::ResetI2PPorts()we copyaddr_infotoaddr_info_newport, change theportin the latter and eventually, ifnecessary, we overwrite
addr_infowithaddr_info_newport.The problem is that after creating the copy,
addr_info.nRandomPosmaybe changed by
ClearNew() -> Delete() -> SwapRandom(). Later,overwriting the entire
addr_infowith the staleaddr_info_newportwould restore the previous/stale
nRandomPos.To fix that change just the port in
addr_info.Fixes #22467