From: Dan Carpenter <dan.carpenter@oracle.com>
To: walter harms <wharms@bfs.de>
Cc: Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Richard Weinberger <richard@nod.at>,
kernel-janitors@vger.kernel.org,
Marek Vasut <marek.vasut@gmail.com>,
Cyrille Pitchen <cyrille.pitchen@microchip.com>,
linux-mtd@lists.infradead.org,
Miquel Raynal <miquel.raynal@bootlin.com>,
Brian Norris <computersforpeace@gmail.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
Date: Thu, 15 Aug 2019 14:41:33 +0000 [thread overview]
Message-ID: <20190815144133.GA19557@kadam> (raw)
In-Reply-To: <5D553585.2020907@bfs.de>
On Thu, Aug 15, 2019 at 12:35:49PM +0200, walter harms wrote:
>
>
> Am 15.08.2019 10:32, schrieb Dan Carpenter:
> > The problem is that if "ret" is negative then when we check if
> > "ret > len", that condition is going to be true because of type
> > promotion. So this patch re-orders the code to check for negatives
> > first and preserve those error codes.
> >
> > Fixes: f384b352cbf0 ("mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/mtd/spi-nor/spi-nor.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> > index 63af87609bac..986b0754495d 100644
> > --- a/drivers/mtd/spi-nor/spi-nor.c
> > +++ b/drivers/mtd/spi-nor/spi-nor.c
> > @@ -2903,10 +2903,10 @@ static int spi_nor_read_raw(struct spi_nor *nor, u32 addr, size_t len, u8 *buf)
> >
> > while (len) {
> > ret = spi_nor_read_data(nor, addr, len, buf);
> > - if (!ret || ret > len)
> > - return -EIO;
> > if (ret < 0)
> > return ret;
> > + if (!ret || ret > len)
> > + return -EIO;
>
> Bonuspoints to make this more readable:
>
> if (ret=0 || ret > len)
> return -EIO;
>
> that makes the intention more obvious.
That's not really related to the bug fix.
I do agree with your style though. "ret" is a number here, and not a
bool or error vs no error so = 0 is nicer.
regards,
dan carpenter
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: walter harms <wharms@bfs.de>
Cc: Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Richard Weinberger <richard@nod.at>,
kernel-janitors@vger.kernel.org,
Marek Vasut <marek.vasut@gmail.com>,
Cyrille Pitchen <cyrille.pitchen@microchip.com>,
linux-mtd@lists.infradead.org,
Miquel Raynal <miquel.raynal@bootlin.com>,
Brian Norris <computersforpeace@gmail.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
Date: Thu, 15 Aug 2019 17:41:33 +0300 [thread overview]
Message-ID: <20190815144133.GA19557@kadam> (raw)
In-Reply-To: <5D553585.2020907@bfs.de>
On Thu, Aug 15, 2019 at 12:35:49PM +0200, walter harms wrote:
>
>
> Am 15.08.2019 10:32, schrieb Dan Carpenter:
> > The problem is that if "ret" is negative then when we check if
> > "ret > len", that condition is going to be true because of type
> > promotion. So this patch re-orders the code to check for negatives
> > first and preserve those error codes.
> >
> > Fixes: f384b352cbf0 ("mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/mtd/spi-nor/spi-nor.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> > index 63af87609bac..986b0754495d 100644
> > --- a/drivers/mtd/spi-nor/spi-nor.c
> > +++ b/drivers/mtd/spi-nor/spi-nor.c
> > @@ -2903,10 +2903,10 @@ static int spi_nor_read_raw(struct spi_nor *nor, u32 addr, size_t len, u8 *buf)
> >
> > while (len) {
> > ret = spi_nor_read_data(nor, addr, len, buf);
> > - if (!ret || ret > len)
> > - return -EIO;
> > if (ret < 0)
> > return ret;
> > + if (!ret || ret > len)
> > + return -EIO;
>
> Bonuspoints to make this more readable:
>
> if (ret==0 || ret > len)
> return -EIO;
>
> that makes the intention more obvious.
That's not really related to the bug fix.
I do agree with your style though. "ret" is a number here, and not a
bool or error vs no error so == 0 is nicer.
regards,
dan carpenter
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-08-15 14:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 8:32 [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw() Dan Carpenter
2019-08-15 8:32 ` Dan Carpenter
2019-08-15 10:35 ` walter harms
2019-08-15 10:35 ` walter harms
2019-08-15 14:41 ` Dan Carpenter [this message]
2019-08-15 14:41 ` Dan Carpenter
2019-08-21 7:35 ` Tudor.Ambarus
2019-08-21 7:35 ` Tudor.Ambarus
2019-08-21 8:21 ` Tudor.Ambarus
2019-08-21 8:21 ` Tudor.Ambarus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190815144133.GA19557@kadam \
--to=dan.carpenter@oracle.com \
--cc=computersforpeace@gmail.com \
--cc=cyrille.pitchen@microchip.com \
--cc=dwmw2@infradead.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=tudor.ambarus@microchip.com \
--cc=vigneshr@ti.com \
--cc=wharms@bfs.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.