[added,to,the,v4.1,stable,tree] scsi: isci: avoid array subscript warning

Message ID 20171006111704.25872-45-alexander.levin@verizon.com
State New
Headers show
Series
  • [added,to,the,v4.1,stable,tree] scsi: isci: avoid array subscript warning
Related show

Commit Message

Levin, Alexander (Sasha Levin) Oct. 6, 2017, 11:17 a.m.
From: Arnd Bergmann <arnd@arndb.de>


This patch has been added to the v4.1 stable tree. If you have any
objections, please let us know.

-- 
2.11.0

Patch

===============

[ Upstream commit 5cfa2a3c7342bd0b50716c8bb32ee491af43c785 ]

I'm getting a new warning with gcc-7:

isci/remote_node_context.c: In function 'sci_remote_node_context_destruct':
isci/remote_node_context.c:69:16: error: array subscript is above array bounds [-Werror=array-bounds]

This is odd, since we clearly cover all values for enum
scis_sds_remote_node_context_states here. Anyway, checking for an array
overflow can't harm and it makes the warning go away.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 drivers/scsi/isci/remote_node_context.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c
index 1910100638a2..00602abec0ea 100644
--- a/drivers/scsi/isci/remote_node_context.c
+++ b/drivers/scsi/isci/remote_node_context.c
@@ -66,6 +66,9 @@  const char *rnc_state_name(enum scis_sds_remote_node_context_states state)
 {
 	static const char * const strings[] = RNC_STATES;
 
+	if (state >= ARRAY_SIZE(strings))
+		return "UNKNOWN";
+
 	return strings[state];
 }
 #undef C