net processing: clamp PeerManager::Options user input #28149
Merged
Conversation
This file contains 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
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. |
stickies-v
changed the title
Also changes max_extra_txs into a uint32_t to avoid platform-specific behaviour
stickies-v
force-pushed
the
2023-07/peerman-opts-check-bounds
branch
from
128ad03
to
547fa52
Compare
dergoegge
approved these changes
Aug 7, 2023
maflcko
reviewed
Aug 7, 2023
| namespace node { | ||
|
|
||
| void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& options) | ||
| { | ||
| if (auto value{argsman.GetBoolArg("-txreconciliation")}) options.reconcile_txs = *value; | ||
|
|
||
| if (auto value{argsman.GetIntArg("-maxorphantx")}) { | ||
| options.max_orphan_txs = uint32_t(std::max(int64_t{0}, *value)); | ||
| options.max_orphan_txs = uint32_t((std::clamp<int64_t>(*value, 0, std::numeric_limits<uint32_t>::max()))); |
There was a problem hiding this comment.
unrelated: May be good to write a clang-tidy plugin to enforce the limits are compile-time constants and in range to avoid silent UB at runtime?
The in-range one can be submitted to upstream and the other check can be done in this repo.
maflcko
reviewed
Aug 7, 2023
| namespace node { | ||
|
|
||
| void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& options) | ||
| { | ||
| if (auto value{argsman.GetBoolArg("-txreconciliation")}) options.reconcile_txs = *value; | ||
|
|
||
| if (auto value{argsman.GetIntArg("-maxorphantx")}) { | ||
| options.max_orphan_txs = uint32_t(std::max(int64_t{0}, *value)); | ||
| options.max_orphan_txs = uint32_t((std::clamp<int64_t>(*value, 0, std::numeric_limits<uint32_t>::max()))); |
There was a problem hiding this comment.
Suggested change
| options.max_orphan_txs = uint32_t((std::clamp<int64_t>(*value, 0, std::numeric_limits<uint32_t>::max()))); | |
| options.max_orphan_txs = uint32_t(std::clamp<int64_t>(*value, 0, std::numeric_limits<uint32_t>::max())); |
nit, if you re-touch?
glozow
reviewed
Aug 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Avoid out-of-bounds user input for
PeerManager::Optionsby safely clamping-maxorphantxand-blockreconstructionextratxn, and avoid platform-specific behaviour by changingPeerManager::Options::max_extra_txsfromsize_tto auint32_t. Addresses #27499 (review).Also documents all
PeerManager::Optionsmembers, addressing #27499 (comment).