[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1185-g46f077aa0

[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  46f077aa003449f95781170fc2d0cf674272ad3e (commit)
      from  ea4f98046fe2f9d8362feadb50f058a9fff7ad4f (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 46f077aa003449f95781170fc2d0cf674272ad3e
Author: Tomas Vanek <va...@fb...>
Date:   Fri Mar 13 12:10:50 2020 +0100

    flash/nand/core: fix clang static analyzer warning
    
    core.c:446:
    The left operand of '>>' is a garbage value
    
    There are many places where an error code returned from nand->controller
    operations are ignored. To keep the change minimal, the error checks are
    added only to reading of extended nand info as it was suspected
    to be the cause of the warning.
    
    Addition of the error checks did not fix the warning.
    scan-build-9 report was inspected and IMHO the warning is bogus:
    the term (nand->device->erase_size == 0) cannot give false at line 395
    and then evaluate true at line 462. Fixed by zeroing id_buff.
    
    Change-Id: I97ed7ce0fdf1aa23d746d5fb898bacd050e20ae8
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: http://openocd.zylin.com/5518
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Oleksij Rempel <li...@re...>

diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index b9ac793f2..baef5d59c 100644
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -263,6 +263,7 @@ int nand_read_status(struct nand_device *nand, uint8_t *status)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
 	/* Send read status command */
+	/* FIXME: errors returned from nand->controller are mostly ignored! */
 	nand->controller->command(nand, NAND_CMD_STATUS);
 
 	alive_sleep(1);
@@ -301,7 +302,8 @@ static int nand_poll_ready(struct nand_device *nand, int timeout)
 int nand_probe(struct nand_device *nand)
 {
 	uint8_t manufacturer_id, device_id;
-	uint8_t id_buff[6];
+	uint8_t id_buff[6] = { 0 };	/* zero buff to silence false warning
+					 * from clang static analyzer */
 	int retval;
 	int i;
 
@@ -392,19 +394,34 @@ int nand_probe(struct nand_device *nand)
 	if (nand->device->page_size == 0 ||
 			nand->device->erase_size == 0) {
 		if (nand->bus_width == 8) {
-			nand->controller->read_data(nand, id_buff + 3);
-			nand->controller->read_data(nand, id_buff + 4);
-			nand->controller->read_data(nand, id_buff + 5);
+			retval = nand->controller->read_data(nand, id_buff + 3);
+			if (retval != ERROR_OK)
+				return retval;
+
+			retval = nand->controller->read_data(nand, id_buff + 4);
+			if (retval != ERROR_OK)
+				return retval;
+
+			retval = nand->controller->read_data(nand, id_buff + 5);
+			if (retval != ERROR_OK)
+				return retval;
+
 		} else {
 			uint16_t data_buf;
 
-			nand->controller->read_data(nand, &data_buf);
+			retval = nand->controller->read_data(nand, &data_buf);
+			if (retval != ERROR_OK)
+				return retval;
 			id_buff[3] = data_buf;
 
-			nand->controller->read_data(nand, &data_buf);
+			retval = nand->controller->read_data(nand, &data_buf);
+			if (retval != ERROR_OK)
+				return retval;
 			id_buff[4] = data_buf;
 
-			nand->controller->read_data(nand, &data_buf);
+			retval = nand->controller->read_data(nand, &data_buf);
+			if (retval != ERROR_OK)
+				return retval;
 			id_buff[5] = data_buf >> 8;
 		}
 	}

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

Summary of changes:
 src/flash/nand/core.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository