-
Notifications
You must be signed in to change notification settings - Fork 366
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix deadlock when handling bad calls to batch_funding.._generated
#2841
Fix deadlock when handling bad calls to batch_funding.._generated
#2841
Conversation
WalkthroughThe update includes a crucial fix to resource management by explicitly releasing Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review Status
Actionable comments generated: 1
Configuration used: CodeRabbit UI
Files selected for processing (2)
- lightning/src/ln/channelmanager.rs (1 hunks)
- lightning/src/ln/shutdown_tests.rs (3 hunks)
Additional comments: 2
lightning/src/ln/channelmanager.rs (2)
- 3987-3987: Explicitly dropping
funding_batch_states
usingmem::drop
is a good practice to release resources before entering the loop. This should help in preventing the deadlock issue as described.- 3987-3989: The loop iterates over
shutdown_results
and callsself.finish_close_channel(shutdown_result)
for each item. Ensure thatfinish_close_channel
can handle all possible states ofshutdown_result
that may occur, especially sincefunding_batch_states
has been dropped just before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM but CI needs fixing
When handling calls to `batch_funding_transaction_generated` which were missing outputs for one of the batch channels, we'd previously deadlock when trying to clean up the now-closed channels. This fixes that and adds a new test case for it. Found by the full_stack_target fuzzer.
ec79a63
to
983ca37
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review Status
Actionable comments generated: 0
Configuration used: CodeRabbit UI
Files selected for processing (2)
- lightning/src/ln/channelmanager.rs (1 hunks)
- lightning/src/ln/shutdown_tests.rs (3 hunks)
Files skipped from review as they are similar to previous changes (2)
- lightning/src/ln/channelmanager.rs
- lightning/src/ln/shutdown_tests.rs
Gonna go ahead and land this since the non-test diff is incredibly trivial and we should get to releasing. |
When handling calls to
batch_funding_transaction_generated
which were missing outputs for one of the batch channels, we'd previously deadlock when trying to clean up the now-closed channels. This fixes that and adds a new test case for it.Found by the full_stack_target fuzzer.