mtd: nand: add check for out of page read
authorJason Liu <r64343@freescale.com>
Fri, 19 Nov 2010 08:40:45 +0000 (16:40 +0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 3 Dec 2010 16:31:44 +0000 (16:31 +0000)
When run mtd_oobtest case, there will be one error for step(4),
which turned out it need add one check for out of page read in
nand_do_read_oob just like mtd_do_write_oob did it already.
This commit also fix one typo error for comments in mtd_do_write_oob

Signed-off-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/nand_base.c

index 1f75a1b1f7c3a6dc5fa0157d800e7c49fe483793..75d199e4f25bdd4232a07f81f93d4d3400aa238c 100644 (file)
@@ -1782,6 +1782,13 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        else
                len = mtd->oobsize;
 
+       /* Do not allow read past end of page */
+       if ((ops->ooboffs + readlen) > len) {
+               DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to read "
+                               "past end of page\n", __func__);
+               return -EINVAL;
+       }
+
        if (unlikely(ops->ooboffs >= len)) {
                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start read "
                                        "outside oob\n", __func__);
@@ -2377,7 +2384,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
                return -EINVAL;
        }
 
-       /* Do not allow reads past end of device */
+       /* Do not allow write past end of device */
        if (unlikely(to >= mtd->size ||
                     ops->ooboffs + ops->ooblen >
                        ((mtd->size >> chip->page_shift) -