| Message ID | 20200914214245.14626-1-alex.dewar90@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: rawnand: atmel: Check return values for nand_read_data_op | expand |
On Mon, 2020-09-14 at 21:42:44 UTC, Alex Dewar wrote: > In atmel_nand_pmecc_read_pg(), nand_read_data_op() is called twice > without the return values being checked for errors. Add these checks. > > Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 309ce410d792..e6ceec8f50dc 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -948,11 +948,17 @@ static int atmel_nand_pmecc_read_pg(struct nand_chip *chip, u8 *buf, if (ret) return ret; - nand_read_data_op(chip, buf, mtd->writesize, false, false); - nand_read_data_op(chip, chip->oob_poi, mtd->oobsize, false, false); + ret = nand_read_data_op(chip, buf, mtd->writesize, false, false); + if (ret) + goto out_disable; + + ret = nand_read_data_op(chip, chip->oob_poi, mtd->oobsize, false, false); + if (ret) + goto out_disable; ret = atmel_nand_pmecc_correct_data(chip, buf, raw); +out_disable: atmel_nand_pmecc_disable(chip, raw); return ret;
In atmel_nand_pmecc_read_pg(), nand_read_data_op() is called twice without the return values being checked for errors. Add these checks. Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> --- drivers/mtd/nand/raw/atmel/nand-controller.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)