Revert "mtd: nand: add check for out of page read"
This reverts commit e14feafbe0
.
The commit limits the maximum amount of bytes which can be read
at one go to the OOB size, which is incorrect, because mtd->read_oob()
allows reading multiple pages at a time, see comment near
"struct mtd_oob_ops" at include/linux/mtd/mtd.h. So this patch
breaks ABI and hence, has to be reverted.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
4ccb3b4497
commit
beda1d4994
1 changed files with 1 additions and 8 deletions
|
@ -1782,13 +1782,6 @@ 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__);
|
||||
|
@ -2384,7 +2377,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Do not allow write past end of device */
|
||||
/* Do not allow reads past end of device */
|
||||
if (unlikely(to >= mtd->size ||
|
||||
ops->ooboffs + ops->ooblen >
|
||||
((mtd->size >> chip->page_shift) -
|
||||
|
|
Loading…
Reference in a new issue