mtd: tests: fix read buffer overflows

Check whether index is within bounds before testing the element.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index a18e8d2f2557..5553cd4eab20 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -512,7 +512,7 @@ static int __init mtd_oobtest_init(void)
                 goto out;
 
         addr0 = 0;
-        for (i = 0; bbt[i] && i < ebcnt; ++i)
+        for (i = 0; i < ebcnt && bbt[i]; ++i)
                 addr0 += mtd->erasesize;
 
         /* Attempt to write off end of OOB */
diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 9648818b9e2c..103cac480fee 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -116,11 +116,11 @@ static int verify_eraseblock(int ebnum)
         loff_t addr = ebnum * mtd->erasesize;
 
         addr0 = 0;
-        for (i = 0; bbt[i] && i < ebcnt; ++i)
+        for (i = 0; i < ebcnt && bbt[i]; ++i)
                 addr0 += mtd->erasesize;
 
         addrn = mtd->size;
-        for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i)
+        for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
                 addrn -= mtd->erasesize;
 
         set_random_data(writebuf, mtd->erasesize);
@@ -219,11 +219,11 @@ static int crosstest(void)
         memset(pp1, 0, pgsize * 4);
 
         addr0 = 0;
-        for (i = 0; bbt[i] && i < ebcnt; ++i)
+        for (i = 0; i < ebcnt && bbt[i]; ++i)
                 addr0 += mtd->erasesize;
 
         addrn = mtd->size;
-        for (i = 0; bbt[ebcnt - i - 1] && i < ebcnt; ++i)
+        for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
                 addrn -= mtd->erasesize;
 
         /* Read 2nd-to-last page to pp1 */
@@ -317,7 +317,7 @@ static int erasecrosstest(void)
 
         ebnum = 0;
         addr0 = 0;
-        for (i = 0; bbt[i] && i < ebcnt; ++i) {
+        for (i = 0; i < ebcnt && bbt[i]; ++i) {
                 addr0 += mtd->erasesize;
                 ebnum += 1;
         }
@@ -413,7 +413,7 @@ static int erasetest(void)
 
         ebnum = 0;
         addr0 = 0;
-        for (i = 0; bbt[i] && i < ebcnt; ++i) {
+        for (i = 0; i < ebcnt && bbt[i]; ++i) {
                 addr0 += mtd->erasesize;
                 ebnum += 1;
         }