arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-20 13:28:10 +00:00
Code Issues Releases Wiki Activity

fix(core/bootloader): fix repeated firmware upload

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-08-29 13:23:26 +02:00 committed by TychoVrahe
parent b8c27d5fd6
commit ee6410acdd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/bootloader/messages.c
View File

@ -577,10 +577,11 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
memcpy(&hdr, received_hdr, sizeof(hdr)); memcpy(&hdr, received_hdr, sizeof(hdr));
size_t headers_end = IMAGE_HEADER_SIZE + vhdr.hdrlen; size_t headers_end = IMAGE_HEADER_SIZE + vhdr.hdrlen;
headers_offset = IMAGE_CODE_ALIGN(IMAGE_HEADER_SIZE + vhdr.hdrlen); size_t tmp_headers_offset =
IMAGE_CODE_ALIGN(IMAGE_HEADER_SIZE + vhdr.hdrlen);
// check padding between headers and the code // check padding between headers and the code
for (size_t i = headers_end; i < headers_offset; i++) { for (size_t i = headers_end; i < tmp_headers_offset; i++) {
if (CHUNK_BUFFER_PTR[i] != 0) { if (CHUNK_BUFFER_PTR[i] != 0) {
MSG_SEND_INIT(Failure); MSG_SEND_INIT(Failure);
MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError); MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError);
@ -705,6 +706,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
NULL); NULL);
} }
headers_offset = IMAGE_CODE_ALIGN(IMAGE_HEADER_SIZE + vhdr.hdrlen);
read_offset = IMAGE_INIT_CHUNK_SIZE; read_offset = IMAGE_INIT_CHUNK_SIZE;
// request the rest of the first chunk // request the rest of the first chunk