From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eo3Xe-0006pe-EI for linux-mtd@lists.infradead.org; Tue, 20 Feb 2018 08:44:52 +0000 Date: Tue, 20 Feb 2018 09:44:26 +0100 From: Boris Brezillon To: Miquel Raynal Cc: Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , linux-mtd@lists.infradead.org Subject: Re: [PATCH v2] mtd: nftl/inftl: check mtd_erase() return value Message-ID: <20180220094426.2f474134@bbrezillon> In-Reply-To: <20180219232215.15938-1-miquel.raynal@bootlin.com> References: <20180219232215.15938-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, 20 Feb 2018 00:22:15 +0100 Miquel Raynal wrote: > Since the creation of mtd_erase(), the function can return a negative > error code without updating the instr->state flag. This happens for > instance when ->_erase() is not implemented or ->erasesize has an invalid > value. The calling function should error out in this case. This changes a bit after this series [1]: no more instr->state field and the caller has to check the return code of mtd_erase() to determine whether the operation failed or succeed. > > Functions in nftlmount/inftlmount call mtd_erase() without checking the > return code. The instr->state flag is checked but might not have been > updated depending on the error path. > > Add checks on the returned value of mtd_erase(). Most of the changes you're doing here are already taken care of in [2]. > > Signed-off-by: Miquel Raynal > --- > > Changes since v1: > - Fix disgraceful compilation issue. > > drivers/mtd/inftlmount.c | 7 +++++-- > drivers/mtd/nftlmount.c | 3 ++- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c > index 8d6bb189ea8e..34fd6180966a 100644 > --- a/drivers/mtd/inftlmount.c > +++ b/drivers/mtd/inftlmount.c > @@ -219,7 +219,9 @@ static int find_boot_record(struct INFTLrecord *inftl) > */ > instr->addr = ip->Reserved0 * inftl->EraseSize; > instr->len = inftl->EraseSize; > - mtd_erase(mtd, instr); > + ret = mtd_erase(mtd, instr); > + if (ret < 0) > + return ret; > } > if ((ip->lastUnit - ip->firstUnit + 1) < ip->virtualUnits) { > printk(KERN_WARNING "INFTL: Media Header " > @@ -393,7 +395,8 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block) > mark only the failed block in the bbt. */ > for (physblock = 0; physblock < inftl->EraseSize; > physblock += instr->len, instr->addr += instr->len) { > - mtd_erase(inftl->mbd.mtd, instr); > + if (mtd_erase(inftl->mbd.mtd, instr) < 0) > + goto fail; > > if (instr->state == MTD_ERASE_FAILED) { > printk(KERN_WARNING "INFTL: error while formatting block %d\n", > diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c > index 184c8fbfe465..8dbc40ab7d73 100644 > --- a/drivers/mtd/nftlmount.c > +++ b/drivers/mtd/nftlmount.c > @@ -331,7 +331,8 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block) > instr->mtd = nftl->mbd.mtd; > instr->addr = block * nftl->EraseSize; > instr->len = nftl->EraseSize; > - mtd_erase(mtd, instr); > + if (mtd_erase(mtd, instr) < 0) > + goto fail; > > if (instr->state == MTD_ERASE_FAILED) { > printk("Error while formatting block %d\n", block); [1]https://patchwork.ozlabs.org/project/linux-mtd/list/?series=28205 [2]https://patchwork.ozlabs.org/patch/872527/ -- Boris Brezillon, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com