From: Alex Dewar Date: Mon, 14 Sep 2020 21:42:44 +0000 (+0100) Subject: mtd: rawnand: atmel: Check return values for nand_read_data_op X-Git-Tag: v5.10.7~1388^2~3^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d27c9859a0c2f270972c26df6b2d2cc69c6d30f4;p=platform%2Fkernel%2Flinux-rpi.git mtd: rawnand: atmel: Check return values for nand_read_data_op 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 Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20200914214245.14626-1-alex.dewar90@gmail.com --- diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 309ce41..e6ceec8f 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;