* [PATCH] mtd: nftl/inftl: check mtd_erase() return value
@ 2018-01-24 23:24 Miquel Raynal
2018-02-12 12:41 ` Boris Brezillon
0 siblings, 1 reply; 3+ messages in thread
From: Miquel Raynal @ 2018-01-24 23:24 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, David Woodhouse,
Brian Norris, Marek Vasut, Cyrille Pitchen
Cc: linux-mtd, Miquel Raynal
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.
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().
Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
---
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..cab4a0b9f881 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);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: nftl/inftl: check mtd_erase() return value
2018-01-24 23:24 [PATCH] mtd: nftl/inftl: check mtd_erase() return value Miquel Raynal
@ 2018-02-12 12:41 ` Boris Brezillon
2018-02-19 23:04 ` Miquel Raynal
0 siblings, 1 reply; 3+ messages in thread
From: Boris Brezillon @ 2018-02-12 12:41 UTC (permalink / raw)
To: Miquel Raynal
Cc: Boris Brezillon, Richard Weinberger, David Woodhouse,
Brian Norris, Marek Vasut, Cyrille Pitchen, linux-mtd
On Thu, 25 Jan 2018 00:24:34 +0100
Miquel Raynal <miquel.raynal@free-electrons.com> 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.
>
> 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().
>
> Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
> ---
> 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..cab4a0b9f881 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))
^ mtd_erase(inftl->mbd.mtd, instr) < 0
which means you did not even compile test your patch :P.
> + 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);
--
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: nftl/inftl: check mtd_erase() return value
2018-02-12 12:41 ` Boris Brezillon
@ 2018-02-19 23:04 ` Miquel Raynal
0 siblings, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2018-02-19 23:04 UTC (permalink / raw)
To: Boris Brezillon
Cc: Miquel Raynal, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
linux-mtd
Hi Boris,
On Mon, 12 Feb 2018 13:41:01 +0100, Boris Brezillon
<boris.brezillon@bootlin.com> wrote:
> On Thu, 25 Jan 2018 00:24:34 +0100
> Miquel Raynal <miquel.raynal@free-electrons.com> 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.
> >
> > 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().
> >
> > Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
> > ---
> > 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..cab4a0b9f881 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))
>
> ^ mtd_erase(inftl->mbd.mtd, instr) < 0
>
> which means you did not even compile test your patch :P.
/o\ shame on me... I feel I've been cheated by my conf :)
>
> > + 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);
>
>
>
--
Miquel Raynal, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-19 23:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-24 23:24 [PATCH] mtd: nftl/inftl: check mtd_erase() return value Miquel Raynal
2018-02-12 12:41 ` Boris Brezillon
2018-02-19 23:04 ` Miquel Raynal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.