[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc1-11-g44ed26a1d

[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  44ed26a1db3b9e0ca9dc1000e967533b1c371ee3 (commit)
      from  fd2a44ab55e7c54ee9e594717aba72d04e85e716 (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 44ed26a1db3b9e0ca9dc1000e967533b1c371ee3
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Sep 19 15:39:50 2022 +0200

    target/riscv: fix use of uninitialized value
    
    Scan-build reports:
            Logic error: Uninitialized argument value
            riscv.c:2688 2nd function call argument is an uninitialized value
    
    This is a real error cause by running the command "riscv
    authdata_write" without arguments. In such case 'value' is not
    initialized and is passed to and used by r->authdata_write().
    
    Reorganize the code to:
    - detect the correct amount or command's arguments;
    - drop the LOG_ERROR() on ERROR_COMMAND_SYNTAX_ERROR;
    - drop the 'else' after 'return'.
    
    Change-Id: I62e031220593b8308bc674b753e15d16d4c5c9ac
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7210
    Tested-by: jenkins
    Reviewed-by: Jan Matyas <ma...@co...>
    Reviewed-by: Tim Newsome <ti...@si...>

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index dfd6a3e3d..ae0a7375d 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -2666,27 +2666,25 @@ COMMAND_HANDLER(riscv_authdata_write)
 	uint32_t value;
 	unsigned int index = 0;
 
-	if (CMD_ARGC == 0) {
-		/* nop */
-	} else if (CMD_ARGC == 1) {
+	if (CMD_ARGC == 0 || CMD_ARGC > 2)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	if (CMD_ARGC == 1) {
 		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], value);
-	} else if (CMD_ARGC == 2) {
+	} else {
 		COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], index);
 		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-	} else {
-		LOG_ERROR("Command takes at most 2 arguments");
-		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct target *target = get_current_target(CMD_CTX);
 	RISCV_INFO(r);
 
-	if (r->authdata_write) {
-		return r->authdata_write(target, value, index);
-	} else {
+	if (!r->authdata_write) {
 		LOG_ERROR("authdata_write is not implemented for this target.");
 		return ERROR_FAIL;
 	}
+
+	return r->authdata_write(target, value, index);
 }
 
 COMMAND_HANDLER(riscv_dmi_read)

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

Summary of changes:
 src/target/riscv/riscv.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository