alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix_coredump_build_error_v5.1' into 'release/v5.1'

Browse Source 
fix(coredump): fix array out of the bounds error (v5.1)

See merge request espressif/esp-idf!32016
This commit is contained in:
Alexey Gerenkov 2024-07-11 21:46:07 +08:00
commit cb194de911
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/espcoredump/src/core_dump_elf.c
View File

@ -206,8 +206,8 @@ static int elf_write_note_header(core_dump_elf_t *self,
static char name_buffer[ELF_NOTE_NAME_MAX_SIZE] = { 0 }; static char name_buffer[ELF_NOTE_NAME_MAX_SIZE] = { 0 };
elf_note note_hdr = { 0 }; elf_note note_hdr = { 0 };
memcpy((void*)name_buffer, (void*)name, name_len); memcpy(name_buffer, name, name_len);
note_hdr.n_namesz = name_len; note_hdr.n_namesz = ALIGN_UP(name_len, 4);
note_hdr.n_descsz = data_sz; note_hdr.n_descsz = data_sz;
note_hdr.n_type = type; note_hdr.n_type = type;
// write note header // write note header
@ -215,7 +215,7 @@ static int elf_write_note_header(core_dump_elf_t *self,
ELF_CHECK_ERR((err == ESP_OK), ELF_PROC_ERR_WRITE_FAIL, ELF_CHECK_ERR((err == ESP_OK), ELF_PROC_ERR_WRITE_FAIL,
"Write ELF note header failure (%d)", err); "Write ELF note header failure (%d)", err);
// write note name // write note name
err = esp_core_dump_write_data(&self->write_data, name_buffer, name_len); err = esp_core_dump_write_data(&self->write_data, name_buffer, note_hdr.n_namesz);
ELF_CHECK_ERR((err == ESP_OK), ELF_PROC_ERR_WRITE_FAIL, ELF_CHECK_ERR((err == ESP_OK), ELF_PROC_ERR_WRITE_FAIL,
"Write ELF note name failure (%d)", err); "Write ELF note name failure (%d)", err);
@ -541,7 +541,7 @@ static void elf_write_core_dump_note_cb(void *opaque, const char *data)
static int elf_add_wdt_panic_details(core_dump_elf_t *self) static int elf_add_wdt_panic_details(core_dump_elf_t *self)
{ {
uint32_t name_len = ALIGN_UP(sizeof(ELF_ESP_CORE_DUMP_PANIC_DETAILS_NOTE_NAME), 4); uint32_t name_len = sizeof(ELF_ESP_CORE_DUMP_PANIC_DETAILS_NOTE_NAME);
core_dump_elf_opaque_t param = { core_dump_elf_opaque_t param = {
.self = self, .self = self,
.total_size = 0, .total_size = 0,
@ -575,7 +575,7 @@ static int elf_add_wdt_panic_details(core_dump_elf_t *self)
} }
} }
return ALIGN_UP(name_len + ALIGN_UP(self->note_data_size, 4) + sizeof(elf_note), 4); return ALIGN_UP(ALIGN_UP(name_len, 4) + ALIGN_UP(self->note_data_size, 4) + sizeof(elf_note), 4);
} }
#endif //CONFIG_ESP_TASK_WDT_EN #endif //CONFIG_ESP_TASK_WDT_EN