diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-05-25 13:50:20 +0900 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-06-01 10:09:35 +0200 |
| commit | 79e0348c4e24fd1affdcf055e0269755580e0fcc (patch) | |
| tree | 1f2feb76d0f444962a23c5f68e4074d92573ce37 | |
| parent | 2165c4a1f71a04c7ea6493f18740a3afd4e47e4f (diff) | |
| download | linux-79e0348c4e24fd1affdcf055e0269755580e0fcc.tar.gz linux-79e0348c4e24fd1affdcf055e0269755580e0fcc.tar.bz2 linux-79e0348c4e24fd1affdcf055e0269755580e0fcc.zip | |
mtd: nand: check ecc->total sanity in nand_scan_tail
Drivers are supposed to set correct ecc->{size,strength,bytes} before
calling nand_scan_tail(), but it does not complain about ecc->total
bigger than oobsize.
In this case, chip->scan_bbt() crashes due to memory corruption, but
it is hard to debug. It would be kind to fail it earlier with a clear
message.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 58a97e30b3f4..2404bb046b69 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4789,6 +4789,11 @@ int nand_scan_tail(struct mtd_info *mtd) goto err_free; } ecc->total = ecc->steps * ecc->bytes; + if (ecc->total > mtd->oobsize) { + WARN(1, "Total number of ECC bytes exceeded oobsize\n"); + ret = -EINVAL; + goto err_free; + } /* * The number of bytes available for a client to place data into |