commit 397b062ae815cc30cbaa8c093cc6ff80a19d5c44
author Heinrich Schuchardt <xypron.glpk@gmx.de> Tue Jul 30 23:29:21 2019 +0200
committer Tom Rini <trini@konsulko.com> Wed Jul 31 13:08:07 2019 -0400
tree 430bbea5f437115dd4feda445c1255b39c0dc2a7
parent 225055bc2b9ad875f2f947490776ea9d6525328e

nand: davinci: avoid out of bounds array access

The array bounds have to be checked before accessing the array element.

Identified by cppcheck.

Fixes: 67ac6ffaeefb ("mtd: nand: davinci: add opportunity to write keystone U-boot image")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

drivers/mtd/nand/raw/davinci_nand.c

diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 33c2f16..724bbee 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -739,8 +739,8 @@
 
 	layout = &nand_keystone_rbl_4bit_layout_oobfirst;
 	layout->oobavail = 0;
-	for (i = 0; layout->oobfree[i].length &&
-	     i < ARRAY_SIZE(layout->oobfree); i++)
+	for (i = 0; i < ARRAY_SIZE(layout->oobfree) &&
+	     layout->oobfree[i].length; i++)
 		layout->oobavail += layout->oobfree[i].length;
 
 	nand->write_page = nand_davinci_write_page;