espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

loader: Fix handling of APP_RETRIEVE_LEN_ELF_SHA

Browse Source 
With the default APP_RETRIEVE_LEN_ELF_SHA setting, core dump files only have a
truncated ELF SHA256 in them. Account for this when comparing the core dump SHA
with the app ELF SHA.
This commit is contained in:
Angus Gratton
2023-04-13 11:44:01 +10:00
committed by BOT
parent 76e1212c8f
commit e32cca2ad1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/espcoredump/corefile/loader.py
View File

@@ -271,10 +271,20 @@ class EspCoreDumpLoader(EspCoreDumpVersion):
'sha256' / Bytes(64) # SHA256 as hex string
)
coredump_sha256 = coredump_sha256_struct.parse(note_sec.desc[:coredump_sha256_struct.sizeof()])
if coredump_sha256.sha256 != app_sha256:
logging.debug('App SHA256: {!r}'.format(app_sha256))
logging.debug('Core dump SHA256: {!r}'.format(coredump_sha256))
# Actual coredump SHA may be shorter than a full SHA256 hash
# with NUL byte padding, according to the app's APP_RETRIEVE_LEN_ELF_SHA
# length
core_sha_trimmed = coredump_sha256.sha256.rstrip(b'\x00').decode()
app_sha_trimmed = app_sha256[:len(core_sha_trimmed)].decode()
if core_sha_trimmed != app_sha_trimmed:
raise ESPCoreDumpLoaderError(
'Invalid application image for coredump: coredump SHA256({!r}) != app SHA256({!r}).'
.format(coredump_sha256, app_sha256))
'Invalid application image for coredump: coredump SHA256({}) != app SHA256({}).'
.format(core_sha_trimmed, app_sha_trimmed))
if coredump_sha256.ver != self.version:
raise ESPCoreDumpLoaderError(
'Invalid application image for coredump: coredump SHA256 version({}) != app SHA256 version({}).'