Skip to content

ballet, txn: reject v1 transactions with duplicate addresses #11436

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
topointon-jump wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −3
Open

ballet, txn: reject v1 transactions with duplicate addresses #11436

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
8 changes: 8 additions & 0 deletions src/ballet/txn/fd_txn_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ fd_txn_parse_core( uchar const * payload,

CHECK_LEFT( FD_TXN_ACCT_ADDR_SZ*acct_addr_cnt ); ulong acct_addr_off = i ; i+=FD_TXN_ACCT_ADDR_SZ*acct_addr_cnt;

/* Throw out transactions with duplicate addresses at parse time.
Agave rejects these at sanitisation time. */
for( ulong j=0UL; j<(ulong)acct_addr_cnt; j++ ) {
for( ulong k=j+1UL; k<(ulong)acct_addr_cnt; k++ ) {
CHECK( memcmp( payload+acct_addr_off+FD_TXN_ACCT_ADDR_SZ*j, payload+acct_addr_off+FD_TXN_ACCT_ADDR_SZ*k, FD_TXN_ACCT_ADDR_SZ ) );
Comment thread
topointon-jump marked this conversation as resolved.
Comment thread
topointon-jump marked this conversation as resolved.
}
}

/* Config values: 4 bytes per set mask bit */
ulong config_values_off = i;
ulong num_config_values = (ulong)fd_uint_popcnt( config_mask );
Expand Down
31 changes: 29 additions & 2 deletions src/ballet/txn/test_txn_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ build_legacy_one_instr( uchar * buf, ushort instr_acct_cnt ) {
buf[ o++ ] = 0x01; /* header: num_readonly_unsigned = 1 */
buf[ o++ ] = 0x02; /* account address count = 2 */
for( ulong a=0UL; a<2UL; a++ )
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)(a*32UL+j); /* 2 addresses */
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)( j ? 0xA0UL+j : a ); /* 2 distinct addresses */
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)(0xB0+j); /* recent blockhash */
buf[ o++ ] = 0x01; /* instruction count = 1 */
buf[ o++ ] = 0x01; /* program_id index = 1 */
Expand Down Expand Up @@ -307,7 +307,7 @@ build_v1( uchar * buf,
buf[ o++ ] = num_addr;
/* addresses */
for( ulong a=0UL; a<num_addr; a++ )
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)(a*32UL+j);
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)( j ? 0xA0UL+j : a ); /* byte 0 = index so addresses are distinct */
/* config values: one 4-byte word per set bit. When the heap-size bit
(bit 4, the highest bit) is set its word is last and must hold a valid
heap size, so use 64 KiB; the other words are arbitrary. */
Expand Down Expand Up @@ -463,6 +463,33 @@ void txn_v1_correctness( void ) {
FD_TEST( 0UL == fd_txn_parse( v1_buf, sz, out_buf, &counters ) );
}

/* duplicate address (address 2 is a copy of address 1) */
{
ulong sz = build_v1( v1_buf, 1, 0, 1, 0u, 3, ix1, 1 );
ulong addr_off = 1UL+3UL+4UL+32UL+1UL+1UL;
fd_memcpy( v1_buf+addr_off+2UL*32UL, v1_buf+addr_off+1UL*32UL, 32UL );
counters = (fd_txn_parse_counters_t){0};
FD_TEST( 0UL == fd_txn_parse( v1_buf, sz, out_buf, &counters ) );
}

/* duplicate address at the far end (address 63 is a copy of address 0) */
{
ulong sz = build_v1( v1_buf, 1, 0, 1, 0u, 64, ix1, 1 );
ulong addr_off = 1UL+3UL+4UL+32UL+1UL+1UL;
fd_memcpy( v1_buf+addr_off+63UL*32UL, v1_buf+addr_off, 32UL );
counters = (fd_txn_parse_counters_t){0};
FD_TEST( 0UL == fd_txn_parse( v1_buf, sz, out_buf, &counters ) );
}

/* num_addr == FD_TXN_ACCT_ADDR_MAX (64) distinct addresses is accepted */
{
ulong sz = build_v1( v1_buf, 1, 0, 1, 0u, 64, ix1, 1 );
counters = (fd_txn_parse_counters_t){0};
FD_TEST( fd_txn_parse( v1_buf, sz, out_buf, &counters ) );
FD_TEST( counters.success_cnt==1UL );
FD_TEST( parsed->acct_addr_cnt == 64 );
}

/* num_addr exceeds FD_TXN_ACCT_ADDR_MAX (64) */
{
ulong sz = build_v1( v1_buf, 1, 0, 1, 0u, 65, ix1, 1 );
Expand Down
2 changes: 1 addition & 1 deletion src/disco/keyguard/test_keyguard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ build_txn_v1( uchar * buf,
buf[ o++ ] = (uchar)instr_cnt;
buf[ o++ ] = (uchar)num_addr;
for( ulong a=0UL; a<num_addr; a++ )
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)(a*32UL+j);
for( ulong j=0UL; j<32UL; j++ ) buf[ o++ ] = (uchar)( j ? 0xA0UL+j : a );
/* instruction headers: program id 1, no accounts, no data */
for( ulong x=0UL; x<instr_cnt; x++ ) {
buf[ o++ ] = (uchar)1; /* program id */
Expand Down
Loading