Skip to content
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

avoid using uninitialized data from G_io_apdu_buffer #6

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

avoid using uninitialized data from G_io_apdu_buffer #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ff7027
make sure "all" is the first target in Makefile
zeldovich Jan 23, 2020
04ed665
avoid reading past the number of bytes returned by io_exchange
zeldovich Jan 23, 2020
08ed394
fix the out-of-bounds check to avoid UB
zeldovich Jan 23, 2020
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
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Define the "all" target first, so that "make" without any
## additional arguments builds it.
all: default

ifeq ($(BOLOS_SDK),)
$(error BOLOS_SDK is not set)
endif
Expand Down Expand Up @@ -103,8 +107,6 @@ LDLIBS += -lm -lgcc -lc

# Main rules

all: default

load: all
python -m ledgerblue.loadApp $(APP_LOAD_PARAMS)

Expand Down
54 changes: 36 additions & 18 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@ txn_deny()
}

static void
copy_and_advance(void *dst, uint8_t **p, size_t len)
copy_and_advance(void *dst, uint8_t **p, uint8_t *pend, int len)
{
if (pend - *p < len) {
THROW(0x6700);
}

os_memmove(dst, *p, len);
*p += len;
}
Expand Down Expand Up @@ -144,6 +148,10 @@ algorand_main(void)
THROW(0x6982);
}

if (rx <= OFFSET_INS) {
THROW(0x6700);
}

if (G_io_apdu_buffer[OFFSET_CLA] != CLA) {
THROW(0x6E00);
}
Expand All @@ -155,22 +163,23 @@ algorand_main(void)
{
os_memset(&current_txn, 0, sizeof(current_txn));
uint8_t *p;
uint8_t *pend = &G_io_apdu_buffer[rx];
if (ins == INS_SIGN_PAYMENT_V2) {
p = &G_io_apdu_buffer[2];
} else {
p = &G_io_apdu_buffer[OFFSET_CDATA];
}

current_txn.type = PAYMENT;
copy_and_advance( current_txn.sender, &p, 32);
copy_and_advance(&current_txn.fee, &p, 8);
copy_and_advance(&current_txn.firstValid, &p, 8);
copy_and_advance(&current_txn.lastValid, &p, 8);
copy_and_advance( current_txn.genesisID, &p, 32);
copy_and_advance( current_txn.genesisHash, &p, 32);
copy_and_advance( current_txn.payment.receiver, &p, 32);
copy_and_advance(&current_txn.payment.amount, &p, 8);
copy_and_advance( current_txn.payment.close, &p, 32);
copy_and_advance( current_txn.sender, &p, pend, 32);
copy_and_advance(&current_txn.fee, &p, pend, 8);
copy_and_advance(&current_txn.firstValid, &p, pend, 8);
copy_and_advance(&current_txn.lastValid, &p, pend, 8);
copy_and_advance( current_txn.genesisID, &p, pend, 32);
copy_and_advance( current_txn.genesisHash, &p, pend, 32);
copy_and_advance( current_txn.payment.receiver, &p, pend, 32);
copy_and_advance(&current_txn.payment.amount, &p, pend, 8);
copy_and_advance( current_txn.payment.close, &p, pend, 32);

ui_txn();
flags |= IO_ASYNCH_REPLY;
Expand All @@ -181,27 +190,32 @@ algorand_main(void)
{
os_memset(&current_txn, 0, sizeof(current_txn));
uint8_t *p;
uint8_t *pend = &G_io_apdu_buffer[rx];
if (ins == INS_SIGN_KEYREG_V2) {
p = &G_io_apdu_buffer[2];
} else {
p = &G_io_apdu_buffer[OFFSET_CDATA];
}

current_txn.type = KEYREG;
copy_and_advance( current_txn.sender, &p, 32);
copy_and_advance(&current_txn.fee, &p, 8);
copy_and_advance(&current_txn.firstValid, &p, 8);
copy_and_advance(&current_txn.lastValid, &p, 8);
copy_and_advance( current_txn.genesisID, &p, 32);
copy_and_advance( current_txn.genesisHash, &p, 32);
copy_and_advance( current_txn.keyreg.votepk, &p, 32);
copy_and_advance( current_txn.keyreg.vrfpk, &p, 32);
copy_and_advance( current_txn.sender, &p, pend, 32);
copy_and_advance(&current_txn.fee, &p, pend, 8);
copy_and_advance(&current_txn.firstValid, &p, pend, 8);
copy_and_advance(&current_txn.lastValid, &p, pend, 8);
copy_and_advance( current_txn.genesisID, &p, pend, 32);
copy_and_advance( current_txn.genesisHash, &p, pend, 32);
copy_and_advance( current_txn.keyreg.votepk, &p, pend, 32);
copy_and_advance( current_txn.keyreg.vrfpk, &p, pend, 32);

ui_txn();
flags |= IO_ASYNCH_REPLY;
} break;

case INS_SIGN_MSGPACK: {
if (rx <= OFFSET_LC) {
THROW(0x6700);
}

switch (G_io_apdu_buffer[OFFSET_P1]) {
case P1_FIRST:
msgpack_next_off = 0;
Expand All @@ -217,6 +231,10 @@ algorand_main(void)
THROW(0x6700);
}

if (rx < OFFSET_CDATA + lc) {
THROW(0x6700);
}

os_memmove(&msgpack_buf[msgpack_next_off], &G_io_apdu_buffer[OFFSET_CDATA], lc);
msgpack_next_off += lc;

Expand Down