1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 3d7ed432fa4..8c21b89d2d0 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2756,7 +2756,8 @@ int nand_scan_tail(struct mtd_info *mtd)
          * the out of band area
          */
         chip->ecc.layout->oobavail = 0;
-        for (i = 0; chip->ecc.layout->oobfree[i].length; i++)
+        for (i = 0; chip->ecc.layout->oobfree[i].length
+                        && i < ARRAY_SIZE(chip->ecc.layout->oobfree); i++)
                 chip->ecc.layout->oobavail +=
                         chip->ecc.layout->oobfree[i].length;
         mtd->oobavail = chip->ecc.layout->oobavail;