[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1280-gbd425de3f

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  bd425de3fbb9ba73d4e24573e2b2262ba1b8a3f5 (commit)
       via  6f88aa0fb3bb7a91b5327b75e8fb772ed6d3be2d (commit)
      from  061cae171c9d2b6015a565dcc748dd04319e08cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd425de3fbb9ba73d4e24573e2b2262ba1b8a3f5
Author: Antonio Borneo <bor...@gm...>
Date:   Thu May 21 16:03:17 2020 +0200

    jtag/tcl: fix memory leak in command 'irscan'
    
    If the function parse_u64() fails, we jump to return, thus leaking
    the memory just allocated in 'v'.
    Issue identified by clang.
    
    Move earlier the call to parse_u64() and the associated test,
    before memory allocation.
    
    While there, fix a possible NULL pointer dereferencing in case the
    calloc() fails, by testing for allocation failure.
    
    Change-Id: I6a77ee17aceb282bbdfefe7cdafeba2e0e7012f1
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5692
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 01210bd69..d2f1f0db5 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1129,14 +1129,19 @@ COMMAND_HANDLER(handle_irscan_command)
 
 			return ERROR_FAIL;
 		}
-		int field_size = tap->ir_length;
-		fields[i].num_bits = field_size;
-		uint8_t *v = calloc(1, DIV_ROUND_UP(field_size, 8));
-
 		uint64_t value;
 		retval = parse_u64(CMD_ARGV[i * 2 + 1], &value);
 		if (ERROR_OK != retval)
 			goto error_return;
+
+		int field_size = tap->ir_length;
+		fields[i].num_bits = field_size;
+		uint8_t *v = calloc(1, DIV_ROUND_UP(field_size, 8));
+		if (!v) {
+			LOG_ERROR("Out of memory");
+			goto error_return;
+		}
+
 		buf_set_u64(v, 0, field_size, value);
 		fields[i].out_value = v;
 		fields[i].in_value = NULL;

commit 6f88aa0fb3bb7a91b5327b75e8fb772ed6d3be2d
Author: Antonio Borneo <bor...@gm...>
Date:   Fri May 22 18:55:34 2020 +0200

    target/cortex_a: fix memory leak of register cache
    
    There is no method to free the register cache, allocated in
    armv4_5, so we get a memory leak.
    Issue identified by valgrind.
    
    Implement the method arm_free_reg_cache() and call it in cortex_a
    deinit and to exit for error during arm_dpm_setup().
    Tested on dual cortex-A stm32mp15x.
    This change is inspired from similar fix in commit b01b5fe13a67
    ("armv7m: Fix memory leak in register caching.").
    
    The same allocation is also used by target types "arm7tdmi",
    "arm9tdmi", "arm11" and "xscale" but they all lack the deinit
    method and I do not have relevant HW to test the fix. For such
    reasons they are not addressed in this patch.
    
    Change-Id: I4da1e1f12e36ec245d1f3b11a4eafcbd9a1d2e25
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5693
    Tested-by: jenkins

diff --git a/src/target/arm.h b/src/target/arm.h
index b39957495..3450260f0 100644
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -272,6 +272,8 @@ struct arm_reg {
 };
 
 struct reg_cache *arm_build_reg_cache(struct target *target, struct arm *arm);
+void arm_free_reg_cache(struct arm *arm);
+
 struct reg_cache *armv8_build_reg_cache(struct target *target);
 
 extern const struct command_registration arm_command_handlers[];
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 495d63ec2..72215f90b 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -1100,6 +1100,7 @@ int arm_dpm_setup(struct arm_dpm *dpm)
 	dpm->dwp = calloc(dpm->nwp, sizeof(*dpm->dwp));
 
 	if (!dpm->dbp || !dpm->dwp) {
+		arm_free_reg_cache(arm);
 		free(dpm->dbp);
 		free(dpm->dwp);
 		return ERROR_FAIL;
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index b4581d5f1..58bc3390a 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -769,6 +769,27 @@ struct reg_cache *arm_build_reg_cache(struct target *target, struct arm *arm)
 	return cache;
 }
 
+void arm_free_reg_cache(struct arm *arm)
+{
+	if (!arm || !arm->core_cache)
+		return;
+
+	struct reg_cache *cache = arm->core_cache;
+
+	for (unsigned int i = 0; i < cache->num_regs; i++) {
+		struct reg *reg = &cache->reg_list[i];
+
+		free(reg->feature);
+		free(reg->reg_data_type);
+	}
+
+	free(cache->reg_list[0].arch_info);
+	free(cache->reg_list);
+	free(cache);
+
+	arm->core_cache = NULL;
+}
+
 int arm_arch_state(struct target *target)
 {
 	struct arm *arm = target_to_arm(target);
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index f71b15524..f562a7614 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2959,6 +2959,7 @@ static void cortex_a_deinit_target(struct target *target)
 	}
 
 	free(cortex_a->brp_list);
+	arm_free_reg_cache(dpm->arm);
 	free(dpm->dbp);
 	free(dpm->dwp);
 	free(target->private_config);

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/tcl.c        | 13 +++++++++----
 src/target/arm.h      |  2 ++
 src/target/arm_dpm.c  |  1 +
 src/target/armv4_5.c  | 21 +++++++++++++++++++++
 src/target/cortex_a.c |  1 +
 5 files changed, 34 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository