Skip to content

1.21.0 security review fixes #950

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

Merged
apaillier-ledger merged 7 commits into from
Feb 13, 2026
Merged

1.21.0 security review fixes #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
faec7d4
Added check on parameter size in ERC-20 internal plugin
apaillier-ledger Feb 13, 2026
56d9ceb
Added extra checks in EIP7251 internal plugin
apaillier-ledger Feb 13, 2026
a0b95a7
Added extra checks in EIP7002 internal plugin
apaillier-ledger Feb 13, 2026
5a1d6a8
Switched to strnlen in trusted name
apaillier-ledger Feb 13, 2026
b046678
Added extra checks in ETH2 internal plugin
apaillier-ledger Feb 13, 2026
8c8c87e
Fixed potential memory leak in GCS nested calldata
apaillier-ledger Feb 13, 2026
48f7714
Improved RLP elements parsing
apaillier-ledger Feb 13, 2026
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: 6 additions & 2 deletions src/features/generic_tx_parser/gtp_param_calldata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "utils.h"
#include "read.h"
#include "tx_ctx.h"
#include "mem.h"

enum {
TAG_VERSION = 0x00,
Expand Down Expand Up @@ -146,8 +147,11 @@ static bool process_nested_calldata(const s_param_calldata *param,
calldata_length = calldata->length - CALLDATA_SELECTOR_SIZE;
}

if (((new_calldata = calldata_init(calldata_length, selector_buf)) == NULL) ||
!calldata_append(new_calldata, calldata_buf, calldata_length)) {
if ((new_calldata = calldata_init(calldata_length, selector_buf)) == NULL) {
return false;
}
if (!calldata_append(new_calldata, calldata_buf, calldata_length)) {
app_mem_free(new_calldata);
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/features/provide_trusted_name/trusted_name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ bool verify_trusted_name_struct(const s_trusted_name_ctx *context) {
return false;
}

size_t name_length = strlen(context->trusted_name.name);
size_t name_length = strnlen(context->trusted_name.name, sizeof(context->trusted_name.name));
if ((context->trusted_name.struct_version == 1) ||
((context->trusted_name.name_type == TN_TYPE_ACCOUNT) &&
(context->trusted_name.name_source == TN_SOURCE_ENS))) {
Expand Down
8 changes: 6 additions & 2 deletions src/features/signTx/ethUstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ static bool processChainID(txContext_t *context) {
if (context->currentFieldPos < context->currentFieldLength) {
uint32_t copySize =
MIN(context->commandLength, context->currentFieldLength - context->currentFieldPos);
if (copyTxData(context, context->content->chainID.value, copySize) == false) {
if (copyTxData(context,
context->content->chainID.value + context->currentFieldPos,
copySize) == false) {
return false;
}
}
Expand All @@ -195,7 +197,9 @@ static bool processNonce(txContext_t *context) {
if (context->currentFieldPos < context->currentFieldLength) {
uint32_t copySize =
MIN(context->commandLength, context->currentFieldLength - context->currentFieldPos);
if (copyTxData(context, context->content->nonce.value, copySize) == false) {
if (copyTxData(context,
context->content->nonce.value + context->currentFieldPos,
copySize) == false) {
return false;
}
}
Expand Down
64 changes: 38 additions & 26 deletions src/plugins/eip7002/eip7002_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,29 @@ static void eip7002_plugin_init_contract(ethPluginInitContract_t *param) {
eip7002_context_t *context = (eip7002_context_t *) param->pluginContext;

explicit_bzero(context, sizeof(*context));
memcpy(&context->withdrawal_request[context->received], param->selector, SELECTOR_SIZE);
context->received += SELECTOR_SIZE;
param->result = ETH_PLUGIN_RESULT_OK;
if ((context->received + CALLDATA_SELECTOR_SIZE) > sizeof(context->withdrawal_request)) {
param->result = ETH_PLUGIN_RESULT_ERROR;
} else {
memcpy(&context->withdrawal_request[context->received],
param->selector,
CALLDATA_SELECTOR_SIZE);
context->received += CALLDATA_SELECTOR_SIZE;
param->result = ETH_PLUGIN_RESULT_OK;
}
}

static void eip7002_plugin_provider_parameter(ethPluginProvideParameter_t *param) {
eip7002_context_t *context = (eip7002_context_t *) param->pluginContext;

if ((context->received + param->parameter_size) > sizeof(context->withdrawal_request)) {
param->result = ETH_PLUGIN_RESULT_ERROR;
} else {
memcpy(&context->withdrawal_request[context->received],
param->parameter,
param->parameter_size);
context->received += param->parameter_size;
param->result = ETH_PLUGIN_RESULT_OK;
}
memcpy(&context->withdrawal_request[context->received],
param->parameter,
param->parameter_size);
context->received += param->parameter_size;
param->result = ETH_PLUGIN_RESULT_OK;
}

static void eip7002_plugin_finalize(ethPluginFinalize_t *param) {
Expand Down Expand Up @@ -84,6 +91,9 @@ static void eip7002_plugin_query_contract_ui(ethQueryContractUI_t *param) {

switch (param->screenIndex) {
case 0:
if (param->msgLength < 2) {
return;
}
strlcpy(param->title, "Validator", param->titleLength);
memcpy(param->msg, "0x", 2);
format_hex(context->validator_pubkey,
Expand All @@ -110,23 +120,25 @@ static void eip7002_plugin_query_contract_ui(ethQueryContractUI_t *param) {
}

void eip7002_plugin_call(eth_plugin_msg_t msg, void *param) {
switch (msg) {
case ETH_PLUGIN_INIT_CONTRACT:
eip7002_plugin_init_contract(param);
break;
case ETH_PLUGIN_PROVIDE_PARAMETER:
eip7002_plugin_provider_parameter(param);
break;
case ETH_PLUGIN_FINALIZE:
eip7002_plugin_finalize(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_ID:
eip7002_plugin_query_contract_id(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_UI:
eip7002_plugin_query_contract_ui(param);
break;
default:
PRINTF("Unhandled message 0x%x\n", msg);
if (param != NULL) {
switch (msg) {
case ETH_PLUGIN_INIT_CONTRACT:
eip7002_plugin_init_contract(param);
break;
case ETH_PLUGIN_PROVIDE_PARAMETER:
eip7002_plugin_provider_parameter(param);
break;
case ETH_PLUGIN_FINALIZE:
eip7002_plugin_finalize(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_ID:
eip7002_plugin_query_contract_id(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_UI:
eip7002_plugin_query_contract_ui(param);
break;
default:
PRINTF("Unhandled message 0x%x\n", msg);
}
}
}
109 changes: 60 additions & 49 deletions src/plugins/eip7251/eip7251_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,29 @@ static void eip7251_plugin_init_contract(ethPluginInitContract_t *param) {
eip7251_context_t *context = (eip7251_context_t *) param->pluginContext;

explicit_bzero(context, sizeof(*context));
memcpy(&context->consolidation_request[context->received], param->selector, SELECTOR_SIZE);
context->received += SELECTOR_SIZE;
param->result = ETH_PLUGIN_RESULT_OK;
if ((context->received + CALLDATA_SELECTOR_SIZE) > sizeof(context->consolidation_request)) {
param->result = ETH_PLUGIN_RESULT_ERROR;
} else {
memcpy(&context->consolidation_request[context->received],
param->selector,
CALLDATA_SELECTOR_SIZE);
context->received += CALLDATA_SELECTOR_SIZE;
param->result = ETH_PLUGIN_RESULT_OK;
}
}

static void eip7251_plugin_provider_parameter(ethPluginProvideParameter_t *param) {
eip7251_context_t *context = (eip7251_context_t *) param->pluginContext;

if ((context->received + param->parameter_size) > sizeof(context->consolidation_request)) {
param->result = ETH_PLUGIN_RESULT_ERROR;
} else {
memcpy(&context->consolidation_request[context->received],
param->parameter,
param->parameter_size);
context->received += param->parameter_size;
param->result = ETH_PLUGIN_RESULT_OK;
}
memcpy(&context->consolidation_request[context->received],
param->parameter,
param->parameter_size);
context->received += param->parameter_size;
param->result = ETH_PLUGIN_RESULT_OK;
}

static void eip7251_plugin_finalize(ethPluginFinalize_t *param) {
Expand All @@ -80,50 +87,54 @@ static void eip7251_plugin_query_contract_id(ethQueryContractID_t *param) {
static void eip7251_plugin_query_contract_ui(ethQueryContractUI_t *param) {
eip7251_context_t *context = (eip7251_context_t *) param->pluginContext;

memcpy(param->msg, "0x", 2);
switch (param->screenIndex) {
case 0:
if (target_equals_source(context)) {
strlcpy(param->title, "Validator", param->titleLength);
} else {
strlcpy(param->title, "From validator", param->titleLength);
}
format_hex(context->source_pubkey,
sizeof(context->source_pubkey),
&param->msg[2],
param->msgLength - 2);
break;
case 1:
strlcpy(param->title, "To validator", param->titleLength);
format_hex(context->target_pubkey,
sizeof(context->target_pubkey),
&param->msg[2],
param->msgLength - 2);
break;
default:
break;
if (param->msgLength >= 2) {
memcpy(param->msg, "0x", 2);
switch (param->screenIndex) {
case 0:
if (target_equals_source(context)) {
strlcpy(param->title, "Validator", param->titleLength);
} else {
strlcpy(param->title, "From validator", param->titleLength);
}
format_hex(context->source_pubkey,
sizeof(context->source_pubkey),
&param->msg[2],
param->msgLength - 2);
break;
case 1:
strlcpy(param->title, "To validator", param->titleLength);
format_hex(context->target_pubkey,
sizeof(context->target_pubkey),
&param->msg[2],
param->msgLength - 2);
break;
default:
break;
}
param->result = ETH_PLUGIN_RESULT_OK;
}
param->result = ETH_PLUGIN_RESULT_OK;
}

void eip7251_plugin_call(eth_plugin_msg_t msg, void *param) {
switch (msg) {
case ETH_PLUGIN_INIT_CONTRACT:
eip7251_plugin_init_contract(param);
break;
case ETH_PLUGIN_PROVIDE_PARAMETER:
eip7251_plugin_provider_parameter(param);
break;
case ETH_PLUGIN_FINALIZE:
eip7251_plugin_finalize(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_ID:
eip7251_plugin_query_contract_id(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_UI:
eip7251_plugin_query_contract_ui(param);
break;
default:
PRINTF("Unhandled message 0x%x\n", msg);
if (param != NULL) {
switch (msg) {
case ETH_PLUGIN_INIT_CONTRACT:
eip7251_plugin_init_contract(param);
break;
case ETH_PLUGIN_PROVIDE_PARAMETER:
eip7251_plugin_provider_parameter(param);
break;
case ETH_PLUGIN_FINALIZE:
eip7251_plugin_finalize(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_ID:
eip7251_plugin_query_contract_id(param);
break;
case ETH_PLUGIN_QUERY_CONTRACT_UI:
eip7251_plugin_query_contract_ui(param);
break;
default:
PRINTF("Unhandled message 0x%x\n", msg);
}
}
}
9 changes: 7 additions & 2 deletions src/plugins/erc20/erc20_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,13 @@ void erc20_plugin_call(eth_plugin_msg_t message, void *parameters) {
memmove(context->extra_data + extra_data_offset,
msg->parameter,
CALLDATA_CHUNK_SIZE);
context->extra_data_len += msg->parameter_size;
msg->result = ETH_PLUGIN_RESULT_OK;
if (msg->parameter_size <= CALLDATA_CHUNK_SIZE) {
context->extra_data_len += msg->parameter_size;
msg->result = ETH_PLUGIN_RESULT_OK;
} else {
PRINTF("Error: wrong parameter size!\n");
msg->result = ETH_PLUGIN_RESULT_ERROR;
}
} else {
PRINTF("Extra data too long to buffer\n");
context->extra_data_len = 0;
Expand Down
4 changes: 4 additions & 0 deletions src/plugins/eth2/eth2_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ typedef struct eth2_deposit_parameters_t {
} eth2_deposit_parameters_t;

void eth2_plugin_call(eth_plugin_msg_t message, void *parameters) {
if (parameters == NULL) {
return;
}
switch (message) {
case ETH_PLUGIN_INIT_CONTRACT: {
ethPluginInitContract_t *msg = (ethPluginInitContract_t *) parameters;
Expand All @@ -51,6 +54,7 @@ void eth2_plugin_call(eth_plugin_msg_t message, void *parameters) {
ethPluginProvideParameter_t *msg = (ethPluginProvideParameter_t *) parameters;
eth2_deposit_parameters_t *context = (eth2_deposit_parameters_t *) msg->pluginContext;
uint32_t index;

PRINTF("eth2 plugin provide parameter %d %.*H\n",
msg->parameterOffset,
32,
Expand Down