From patchwork Wed Apr 22 02:51:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [patch/RESEND,2.6.30-rc2,1/3] NAND: don't walk past end of oobfree[] Date: Tue, 21 Apr 2009 16:51:20 -0000 From: David Brownell X-Patchwork-Id: 26289 Message-Id: <200904211951.21270.david-b@pacbell.net> To: Linux MTD Cc: dwmw2@infradead.org, Thomas Gleixner , "Narnakaje, Snehaprabha" , Andrew Morton From: David Brownell Resolve issue noted by Sneha: when computing oobavail from the list of free areas in the OOB, don't assume there will always be an unused slot at the end. With ECC_HW_SYNDROME and 4KB page chips, it's fairly likely there *won't* be one. Signed-off-by: David Brownell Cc: "Narnakaje, Snehaprabha" " --- RESEND refreshed 7-april version. Still seems appropriate for a 2.6.30-rc merge. drivers/mtd/nand/nand_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- 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;