arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-26 00:18:15 +00:00
Code Issues Releases Wiki Activity

fix(core): skip polling in storage callback (workaround)

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2025-04-01 09:07:09 +02:00 committed by cepetr
parent 7dcdb54262
commit cfea362cfc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/embed/sys/syscall/stm32/syscall_dispatch.c
View File

@ -80,20 +80,27 @@
#include "syscall_internal.h" #include "syscall_internal.h"
#include "syscall_verifiers.h" #include "syscall_verifiers.h"
bool g_in_app_callback = false;
static PIN_UI_WAIT_CALLBACK storage_init_callback = NULL; static PIN_UI_WAIT_CALLBACK storage_init_callback = NULL;
static secbool storage_init_callback_wrapper( static secbool storage_init_callback_wrapper(
uint32_t wait, uint32_t progress, enum storage_ui_message_t message) { uint32_t wait, uint32_t progress, enum storage_ui_message_t message) {
return (secbool)invoke_app_callback(wait, progress, message, secbool result;
storage_init_callback); g_in_app_callback = true;
result = invoke_app_callback(wait, progress, message, storage_init_callback);
g_in_app_callback = false;
return result;
} }
static firmware_hash_callback_t firmware_hash_callback = NULL; static firmware_hash_callback_t firmware_hash_callback = NULL;
static void firmware_hash_callback_wrapper(void *context, uint32_t progress, static void firmware_hash_callback_wrapper(void *context, uint32_t progress,
uint32_t total) { uint32_t total) {
g_in_app_callback = true;
invoke_app_callback((uint32_t)context, progress, total, invoke_app_callback((uint32_t)context, progress, total,
firmware_hash_callback); firmware_hash_callback);
g_in_app_callback = false;
} }
__attribute((no_stack_protector)) void syscall_handler(uint32_t *args, __attribute((no_stack_protector)) void syscall_handler(uint32_t *args,
@ -151,7 +158,9 @@ __attribute((no_stack_protector)) void syscall_handler(uint32_t *args,
const sysevents_t *awaited = (sysevents_t *)args[0]; const sysevents_t *awaited = (sysevents_t *)args[0];
sysevents_t *signalled = (sysevents_t *)args[1]; sysevents_t *signalled = (sysevents_t *)args[1];
uint32_t timeout = args[2]; uint32_t timeout = args[2];
if (!g_in_app_callback) {
sysevents_poll__verified(awaited, signalled, timeout); sysevents_poll__verified(awaited, signalled, timeout);
}
} break; } break;
case SYSCALL_REBOOT_DEVICE: { case SYSCALL_REBOOT_DEVICE: {