Skip to content

fix(p2p): bound peer-supplied vector sizes in three NOTIFY handlers #194

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.

Sign up for GitHub

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

Open
raw391 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(p2p): bound peer-supplied vector sizes in three NOTIFY handlers #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/cryptonote_protocol/cryptonote_protocol_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ DISABLE_VS_WARNINGS(4355)

#define CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT 500
#define CURRENCY_PROTOCOL_MAX_TXS_REQUEST_COUNT 5000
#define CURRENCY_PROTOCOL_MAX_VOTES_COUNT 1000
#define CURRENCY_PROTOCOL_MAX_FLASHES_COUNT 1000

namespace cryptonote
{
Expand Down
21 changes: 21 additions & 0 deletions src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,13 @@ namespace cryptonote
{
MTRACE("Received NOTIFY_NEW_MASTER_NODE_VOTE (" << arg.votes.size() << " txes)");

if (arg.votes.size() > CURRENCY_PROTOCOL_MAX_VOTES_COUNT)
{
LOG_ERROR_CCONTEXT("Too many votes (" << arg.votes.size() << ") in NOTIFY_NEW_MASTER_NODE_VOTE (max " << CURRENCY_PROTOCOL_MAX_VOTES_COUNT << "), dropping connection");
drop_connection(context, false, false);
return 1;
}

if(context.m_state != cryptonote_connection_context::state_normal)
return 1;

Expand Down Expand Up @@ -981,6 +988,13 @@ namespace cryptonote
{
MLOG_P2P_MESSAGE("Received NOTIFY_REQUEST_FLUFFY_MISSING_TX (" << arg.missing_tx_indices.size() << " txes), block hash " << arg.block_hash);

if (arg.missing_tx_indices.size() > CURRENCY_PROTOCOL_MAX_OBJECT_REQUEST_COUNT)
{
LOG_ERROR_CCONTEXT("Too many missing_tx_indices (" << arg.missing_tx_indices.size() << "), dropping connection");
drop_connection(context, false, false);
return 1;
}

std::vector<std::pair<cryptonote::blobdata, block>> local_blocks;
std::vector<cryptonote::blobdata> local_txs;

Expand Down Expand Up @@ -1081,6 +1095,13 @@ namespace cryptonote
int t_cryptonote_protocol_handler<t_core>::handle_notify_new_transactions(int command, NOTIFY_NEW_TRANSACTIONS::request& arg, cryptonote_connection_context& context)
{
MLOG_P2P_MESSAGE("Received NOTIFY_NEW_TRANSACTIONS (" << arg.txs.size() << " txes w/ " << arg.flashes.size() << " flashes)");

if (arg.txs.size() > CURRENCY_PROTOCOL_MAX_TXS_REQUEST_COUNT || arg.flashes.size() > CURRENCY_PROTOCOL_MAX_FLASHES_COUNT)
{
LOG_ERROR_CCONTEXT("Oversized NOTIFY_NEW_TRANSACTIONS (txs=" << arg.txs.size() << ", flashes=" << arg.flashes.size() << "), dropping connection");
drop_connection(context, false, false);
return 1;
}
for (const auto &blob: arg.txs)
MLOGIF_P2P_MESSAGE(cryptonote::transaction tx; crypto::hash hash; bool ret = cryptonote::parse_and_validate_tx_from_blob(blob, tx, hash);, ret, "Including transaction " << hash);

Expand Down