Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix TOCTOU w/connection_frontier_request

Browse source
This commit is contained in:
androm3da 2018-01-21 16:38:39 -06:00 • committed by GitHub
commit 13976875d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rai/node/bootstrap.cpp
View file

@ -1030,17 +1030,20 @@ void rai::bootstrap_attempt::requeue_pull (rai::pull_info const & pull_a)
pulls.push_front (pull);
condition.notify_all ();
}
else if (pull.attempts == 4 && !connection_frontier_request.expired ())
else if (pull.attempts == 4)
{
std::lock_guard<std::mutex> lock (mutex);
auto connection_shared = connection_frontier_request.lock ();
auto client (std::make_shared<rai::bulk_pull_client> (connection_shared));
node->background ([client, pull]() {
client->request (pull);
});
if (node->config.logging.bulk_pull_logging ())
if (auto connection_shared = connection_frontier_request.lock ())
{
BOOST_LOG (node->log) << boost::str (boost::format ("Requesting pull account %1% from frontier peer after %2% attempts") % pull.account.to_account () % pull.attempts);
auto client (std::make_shared<rai::bulk_pull_client> (connection_shared));
node->background ([client, pull]() {
client->request (pull);
});
if (node->config.logging.bulk_pull_logging ())
{
BOOST_LOG (node->log) << boost::str (boost::format ("Requesting pull account %1% from frontier peer after %2% attempts") % pull.account.to_account () % pull.attempts);
}
}
}
else