[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-786-g2aaa991a5

[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  2aaa991a503dc28b087d81b59531c66931ad74d8 (commit)
      from  d9940cc9bc6745825abbf7d338df0d1f21c58ab8 (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 2aaa991a503dc28b087d81b59531c66931ad74d8
Author: Tomas Vanek <va...@fb...>
Date:   Sat Jul 30 12:15:43 2022 +0200

    target: fix unaligned return of target_get_working_area_avail()
    
    The working area allocation routines use 4 byte word alignment.
    In the corner case the size of the working area is not aligned,
    target_alloc_working_area() of size = target_get_working_area_avail()
    will fail because the size gets aligned up and does not fit to the area
    which size is aligned down.
    
    Align down the result of target_get_working_area_avail() to cope with that
    corner case.
    
    While on it use fancy ALIGN_... macros instead of bitwise and operator.
    
    Change-Id: Ia2a1e861c401c2c78fe6323379a3776fb4f47b06
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7096
    Tested-by: jenkins
    Reviewed-by: Erhan Kurubas <erh...@es...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/target.c b/src/target/target.c
index 78073f680..553400df6 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2071,7 +2071,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
 		struct working_area *new_wa = malloc(sizeof(*new_wa));
 		if (new_wa) {
 			new_wa->next = NULL;
-			new_wa->size = target->working_area_size & ~3UL; /* 4-byte align */
+			new_wa->size = ALIGN_DOWN(target->working_area_size, 4); /* 4-byte align */
 			new_wa->address = target->working_area;
 			new_wa->backup = NULL;
 			new_wa->user = NULL;
@@ -2082,8 +2082,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
 	}
 
 	/* only allocate multiples of 4 byte */
-	if (size % 4)
-		size = (size + 3) & (~3UL);
+	size = ALIGN_UP(size, 4);
 
 	struct working_area *c = target->working_areas;
 
@@ -2237,7 +2236,7 @@ uint32_t target_get_working_area_avail(struct target *target)
 	uint32_t max_size = 0;
 
 	if (!c)
-		return target->working_area_size;
+		return ALIGN_DOWN(target->working_area_size, 4);
 
 	while (c) {
 		if (c->free && max_size < c->size)

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

Summary of changes:
 src/target/target.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository