From f735faa9319af324b94e4257444419c8dfec6592 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Thu, 18 Nov 2021 09:37:23 +0100 Subject: target,flash: allow target_free_working_area on NULL area pointer Standard C library free() allows NULL pointer as a parameter. Change target_free_working_area() to conform this convention. Remove NULL pointer tests before target_free_working_area() calls. While on it add missing setting pointer to NULL after target_free_working_area(). Change-Id: I7c692ab04a9933398ba5bc614723ad0bdecb87b3 Signed-off-by: Tomas Vanek Reviewed-on: https://review.openocd.org/c/openocd/+/6712 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/flash/nor/cc26xx.c | 7 +++++-- src/flash/nor/cfi.c | 4 +--- src/flash/nor/fespi.c | 6 ++---- src/flash/nor/msp432.c | 5 +++-- src/flash/nor/npcx.c | 6 ++---- src/flash/nor/psoc6.c | 6 ++---- src/flash/nor/sh_qspi.c | 11 +++++++---- 7 files changed, 22 insertions(+), 23 deletions(-) (limited to 'src/flash') diff --git a/src/flash/nor/cc26xx.c b/src/flash/nor/cc26xx.c index f6b5632..7e52649 100644 --- a/src/flash/nor/cc26xx.c +++ b/src/flash/nor/cc26xx.c @@ -140,8 +140,9 @@ static int cc26xx_init(struct flash_bank *bank) return retval; /* Check for working area to use for flash helper algorithm */ - if (cc26xx_bank->working_area) - target_free_working_area(target, cc26xx_bank->working_area); + target_free_working_area(target, cc26xx_bank->working_area); + cc26xx_bank->working_area = NULL; + retval = target_alloc_working_area(target, cc26xx_bank->algo_working_size, &cc26xx_bank->working_area); if (retval != ERROR_OK) @@ -158,6 +159,7 @@ static int cc26xx_init(struct flash_bank *bank) LOG_ERROR("%s: Failed to load flash helper algorithm", cc26xx_bank->family_name); target_free_working_area(target, cc26xx_bank->working_area); + cc26xx_bank->working_area = NULL; return retval; } @@ -172,6 +174,7 @@ static int cc26xx_init(struct flash_bank *bank) LOG_ERROR("%s: Failed to start flash helper algorithm", cc26xx_bank->family_name); target_free_working_area(target, cc26xx_bank->working_area); + cc26xx_bank->working_area = NULL; return retval; } diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c index e3fb6c8..8511586 100644 --- a/src/flash/nor/cfi.c +++ b/src/flash/nor/cfi.c @@ -1359,9 +1359,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, const uint8_t *buffer, /* free up resources */ cleanup: - if (source) - target_free_working_area(target, source); - + target_free_working_area(target, source); target_free_working_area(target, write_algorithm); destroy_reg_param(®_params[0]); diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c index 11da818..5474ffa 100644 --- a/src/flash/nor/fespi.c +++ b/src/flash/nor/fespi.c @@ -661,10 +661,8 @@ static int fespi_write(struct flash_bank *bank, const uint8_t *buffer, return ERROR_OK; err: - if (algorithm_wa) { - target_free_working_area(target, data_wa); - target_free_working_area(target, algorithm_wa); - } + target_free_working_area(target, data_wa); + target_free_working_area(target, algorithm_wa); /* Switch to HW mode before return to prompt */ if (fespi_enable_hw_mode(bank) != ERROR_OK) diff --git a/src/flash/nor/msp432.c b/src/flash/nor/msp432.c index 667349f..61741c8 100644 --- a/src/flash/nor/msp432.c +++ b/src/flash/nor/msp432.c @@ -335,8 +335,9 @@ static int msp432_init(struct flash_bank *bank) } /* Check for working area to use for flash helper algorithm */ - if (msp432_bank->working_area) - target_free_working_area(target, msp432_bank->working_area); + target_free_working_area(target, msp432_bank->working_area); + msp432_bank->working_area = NULL; + retval = target_alloc_working_area(target, ALGO_WORKING_SIZE, &msp432_bank->working_area); if (retval != ERROR_OK) diff --git a/src/flash/nor/npcx.c b/src/flash/nor/npcx.c index af623e5..a4d6395 100644 --- a/src/flash/nor/npcx.c +++ b/src/flash/nor/npcx.c @@ -80,10 +80,8 @@ static int npcx_init(struct flash_bank *bank) struct npcx_flash_bank *npcx_bank = bank->driver_priv; /* Check for working area to use for flash helper algorithm */ - if (npcx_bank->working_area) { - target_free_working_area(target, npcx_bank->working_area); - npcx_bank->working_area = NULL; - } + target_free_working_area(target, npcx_bank->working_area); + npcx_bank->working_area = NULL; int retval = target_alloc_working_area(target, npcx_bank->algo_working_size, &npcx_bank->working_area); diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c index 198dff5..c6166af 100644 --- a/src/flash/nor/psoc6.c +++ b/src/flash/nor/psoc6.c @@ -182,10 +182,8 @@ destroy_rp_free_wa: /* Something went wrong, do some cleanup */ destroy_reg_param(®_params); - if (g_stack_area) { - target_free_working_area(target, g_stack_area); - g_stack_area = NULL; - } + target_free_working_area(target, g_stack_area); + g_stack_area = NULL; return hr; } diff --git a/src/flash/nor/sh_qspi.c b/src/flash/nor/sh_qspi.c index a159844..02af17a 100644 --- a/src/flash/nor/sh_qspi.c +++ b/src/flash/nor/sh_qspi.c @@ -703,11 +703,14 @@ static int sh_qspi_upload_helper(struct flash_bank *bank) }; int ret; - if (info->source) - target_free_working_area(target, info->source); - if (info->io_algorithm) - target_free_working_area(target, info->io_algorithm); + target_free_working_area(target, info->source); + target_free_working_area(target, info->io_algorithm); + /* FIXME: Working areas are allocated during flash probe + * and eventual target_free_all_working_areas() called in case + * of target reset or run is not handled at all. + * Not a big problem if area backp is off. + */ /* flash write code */ if (target_alloc_working_area(target, sizeof(sh_qspi_io_code), &info->io_algorithm) != ERROR_OK) { -- cgit v1.1