auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flash: nor: improve check on memory allocations

Browse Source 
Add check for failed allocation.
Add warning for memory allocation fallback and change existing log
from user to more appropriate warning and debug.
Move allocation and check before changing flash information.

Change-Id: I5b2ab6bc12ea15a5d8f634ed00cf0a0bc7e5a517
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/9384
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Marc Schink <dev@zapb.de>
This commit is contained in:
Antonio Borneo
2025-12-25 11:31:35 +01:00
parent 0c6fe74351
commit 687dd5c5df
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/flash/nor/core.c
View File

@@ -336,6 +336,10 @@ static int default_flash_mem_blank_check(struct flash_bank *bank)
} }
uint8_t *buffer = malloc(buffer_size); uint8_t *buffer = malloc(buffer_size);
if (!buffer) {
LOG_ERROR("Out of memory");
return ERROR_FAIL;
}
for (unsigned int i = 0; i < bank->num_sectors; i++) { for (unsigned int i = 0; i < bank->num_sectors; i++) {
uint32_t j; uint32_t j;
@@ -382,8 +386,10 @@ int default_flash_blank_check(struct flash_bank *bank)
struct target_memory_check_block *block_array; struct target_memory_check_block *block_array;
block_array = malloc(bank->num_sectors * sizeof(struct target_memory_check_block)); block_array = malloc(bank->num_sectors * sizeof(struct target_memory_check_block));
if (!block_array) if (!block_array) {
LOG_WARNING("Running slow fallback erase check - limited host memory available");
return default_flash_mem_blank_check(bank); return default_flash_mem_blank_check(bank);
}
for (unsigned int i = 0; i < bank->num_sectors; i++) { for (unsigned int i = 0; i < bank->num_sectors; i++) {
block_array[i].address = bank->base + bank->sectors[i].offset; block_array[i].address = bank->base + bank->sectors[i].offset;
@@ -413,9 +419,9 @@ int default_flash_blank_check(struct flash_bank *bank)
retval = ERROR_OK; retval = ERROR_OK;
} else { } else {
if (retval == ERROR_NOT_IMPLEMENTED) if (retval == ERROR_NOT_IMPLEMENTED)
LOG_USER("Running slow fallback erase check"); LOG_DEBUG("Running slow fallback erase check");
else else
LOG_USER("Running slow fallback erase check - add working memory"); LOG_WARNING("Running slow fallback erase check - add working memory");
retval = default_flash_mem_blank_check(bank); retval = default_flash_mem_blank_check(bank);
} }
@@ -729,11 +735,25 @@ int flash_write_unlock_verify(struct target *target, struct image *image,
unsigned int section; unsigned int section;
uint32_t section_offset; uint32_t section_offset;
struct flash_bank *c; struct flash_bank *c;
int *padding;
section = 0; section = 0;
section_offset = 0; section_offset = 0;
/* allocate padding array */
int *padding = calloc(image->num_sections, sizeof(*padding));
/* This fn requires all sections to be in ascending order of addresses,
* whereas an image can have sections out of order. */
struct imagesection **sections = malloc(sizeof(struct imagesection *) *
image->num_sections);
if (!padding || !sections) {
LOG_ERROR("Out of memory");
free(padding);
free(sections);
return ERROR_FAIL;
}
if (written) if (written)
*written = 0; *written = 0;
@@ -744,14 +764,6 @@ int flash_write_unlock_verify(struct target *target, struct image *image,
flash_set_dirty(); flash_set_dirty();
} }
/* allocate padding array */
padding = calloc(image->num_sections, sizeof(*padding));
/* This fn requires all sections to be in ascending order of addresses,
* whereas an image can have sections out of order. */
struct imagesection **sections = malloc(sizeof(struct imagesection *) *
image->num_sections);
for (unsigned int i = 0; i < image->num_sections; i++) for (unsigned int i = 0; i < image->num_sections; i++)
sections[i] = &image->sections[i]; sections[i] = &image->sections[i];