diff options
| author | Jason Liu | 2010-11-19 09:40:45 +0100 |
|---|---|---|
| committer | David Woodhouse | 2010-12-03 17:31:44 +0100 |
| commit | e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8 (patch) | |
| tree | 20764c02a1ee5900e101c04d5234a992f89ca4b7 | |
| parent | mtd: fix nand kernel-doc warnings (diff) | |
| download | kernel-qcow2-linux-e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8.tar.gz kernel-qcow2-linux-e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8.tar.xz kernel-qcow2-linux-e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8.zip | |
mtd: nand: add check for out of page read
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>
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 1f75a1b1f7c3..75d199e4f25b 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -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) - |