* [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
@ 2019-08-15 8:32 Dan Carpenter
2019-08-15 10:35 ` walter harms
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Dan Carpenter @ 2019-08-15 8:32 UTC (permalink / raw)
To: Marek Vasut, Cyrille Pitchen
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
kernel-janitors, linux-mtd, Miquel Raynal, Brian Norris,
David Woodhouse
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;
buf += ret;
addr += ret;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
2019-08-15 8:32 [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw() Dan Carpenter
@ 2019-08-15 10:35 ` walter harms
2019-08-15 14:41 ` Dan Carpenter
2019-08-21 7:35 ` Tudor.Ambarus
2019-08-21 8:21 ` Tudor.Ambarus
2 siblings, 1 reply; 5+ messages in thread
From: walter harms @ 2019-08-15 10:35 UTC (permalink / raw)
To: kernel-janitors
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
Marek Vasut, Cyrille Pitchen, linux-mtd, Miquel Raynal,
Brian Norris, David Woodhouse, Dan Carpenter
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.
JM2C,
wh
>
> buf += ret;
> addr += ret;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
2019-08-15 10:35 ` walter harms
@ 2019-08-15 14:41 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2019-08-15 14:41 UTC (permalink / raw)
To: walter harms
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger,
kernel-janitors, Marek Vasut, Cyrille Pitchen, linux-mtd,
Miquel Raynal, Brian Norris, David Woodhouse
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
2019-08-15 8:32 [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw() Dan Carpenter
2019-08-15 10:35 ` walter harms
@ 2019-08-21 7:35 ` Tudor.Ambarus
2019-08-21 8:21 ` Tudor.Ambarus
2 siblings, 0 replies; 5+ messages in thread
From: Tudor.Ambarus @ 2019-08-21 7:35 UTC (permalink / raw)
To: dan.carpenter, marek.vasut, Cyrille.Pitchen
Cc: vigneshr, richard, kernel-janitors, linux-mtd, miquel.raynal,
computersforpeace, dwmw2
DQoNCk9uIDA4LzE1LzIwMTkgMTE6MzIgQU0sIERhbiBDYXJwZW50ZXIgd3JvdGU6DQo+IEV4dGVy
bmFsIEUtTWFpbA0KPiANCj4gDQo+IFRoZSBwcm9ibGVtIGlzIHRoYXQgaWYgInJldCIgaXMgbmVn
YXRpdmUgdGhlbiB3aGVuIHdlIGNoZWNrIGlmDQo+ICJyZXQgPiBsZW4iLCB0aGF0IGNvbmRpdGlv
biBpcyBnb2luZyB0byBiZSB0cnVlIGJlY2F1c2Ugb2YgdHlwZQ0KPiBwcm9tb3Rpb24uICBTbyB0
aGlzIHBhdGNoIHJlLW9yZGVycyB0aGUgY29kZSB0byBjaGVjayBmb3IgbmVnYXRpdmVzDQo+IGZp
cnN0IGFuZCBwcmVzZXJ2ZSB0aG9zZSBlcnJvciBjb2Rlcy4NCj4gDQo+IEZpeGVzOiBmMzg0YjM1
MmNiZjAgKCJtdGQ6IHNwaS1ub3I6IHBhcnNlIFNlcmlhbCBGbGFzaCBEaXNjb3ZlcmFibGUgUGFy
YW1ldGVycyAoU0ZEUCkgdGFibGVzIikNCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8
ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPg0KDQpSZXZpZXdlZC1ieTogVHVkb3IgQW1iYXJ1cyA8
dHVkb3IuYW1iYXJ1c0BtaWNyb2NoaXAuY29tPg0KDQo+IC0tLQ0KPiAgZHJpdmVycy9tdGQvc3Bp
LW5vci9zcGktbm9yLmMgfCA0ICsrLS0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo
KyksIDIgZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvc3BpLW5v
ci9zcGktbm9yLmMgYi9kcml2ZXJzL210ZC9zcGktbm9yL3NwaS1ub3IuYw0KPiBpbmRleCA2M2Fm
ODc2MDliYWMuLjk4NmIwNzU0NDk1ZCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvc3BpLW5v
ci9zcGktbm9yLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvc3BpLW5vci9zcGktbm9yLmMNCj4gQEAg
LTI5MDMsMTAgKzI5MDMsMTAgQEAgc3RhdGljIGludCBzcGlfbm9yX3JlYWRfcmF3KHN0cnVjdCBz
cGlfbm9yICpub3IsIHUzMiBhZGRyLCBzaXplX3QgbGVuLCB1OCAqYnVmKQ0KPiAgDQo+ICAJd2hp
bGUgKGxlbikgew0KPiAgCQlyZXQgPSBzcGlfbm9yX3JlYWRfZGF0YShub3IsIGFkZHIsIGxlbiwg
YnVmKTsNCj4gLQkJaWYgKCFyZXQgfHwgcmV0ID4gbGVuKQ0KPiAtCQkJcmV0dXJuIC1FSU87DQo+
ICAJCWlmIChyZXQgPCAwKQ0KPiAgCQkJcmV0dXJuIHJldDsNCj4gKwkJaWYgKCFyZXQgfHwgcmV0
ID4gbGVuKQ0KPiArCQkJcmV0dXJuIC1FSU87DQo+ICANCj4gIAkJYnVmICs9IHJldDsNCj4gIAkJ
YWRkciArPSByZXQ7DQo+IA0K
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw()
2019-08-15 8:32 [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw() Dan Carpenter
2019-08-15 10:35 ` walter harms
2019-08-21 7:35 ` Tudor.Ambarus
@ 2019-08-21 8:21 ` Tudor.Ambarus
2 siblings, 0 replies; 5+ messages in thread
From: Tudor.Ambarus @ 2019-08-21 8:21 UTC (permalink / raw)
To: dan.carpenter, marek.vasut, Cyrille.Pitchen
Cc: vigneshr, richard, kernel-janitors, linux-mtd, miquel.raynal,
computersforpeace, dwmw2
DQoNCk9uIDA4LzE1LzIwMTkgMTE6MzIgQU0sIERhbiBDYXJwZW50ZXIgd3JvdGU6DQo+IEV4dGVy
bmFsIEUtTWFpbA0KPiANCj4gDQo+IFRoZSBwcm9ibGVtIGlzIHRoYXQgaWYgInJldCIgaXMgbmVn
YXRpdmUgdGhlbiB3aGVuIHdlIGNoZWNrIGlmDQo+ICJyZXQgPiBsZW4iLCB0aGF0IGNvbmRpdGlv
biBpcyBnb2luZyB0byBiZSB0cnVlIGJlY2F1c2Ugb2YgdHlwZQ0KPiBwcm9tb3Rpb24uICBTbyB0
aGlzIHBhdGNoIHJlLW9yZGVycyB0aGUgY29kZSB0byBjaGVjayBmb3IgbmVnYXRpdmVzDQo+IGZp
cnN0IGFuZCBwcmVzZXJ2ZSB0aG9zZSBlcnJvciBjb2Rlcy4NCj4gDQo+IEZpeGVzOiBmMzg0YjM1
MmNiZjAgKCJtdGQ6IHNwaS1ub3I6IHBhcnNlIFNlcmlhbCBGbGFzaCBEaXNjb3ZlcmFibGUgUGFy
YW1ldGVycyAoU0ZEUCkgdGFibGVzIikNCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8
ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvbXRkL3NwaS1ub3Iv
c3BpLW5vci5jIHwgNCArKy0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAy
IGRlbGV0aW9ucygtKQ0KPiANCg0KU2luY2UgdGhlIGJ1ZyB3YXMgbm90IGludHJvZHVjZWQgaW4g
dGhlIHByZXZpb3VzIHJlbGVhc2UgYW5kIHdlIGFyZSBxdWl0ZSBsYXRlDQpmb3IgbXRkL2ZpeGVz
LA0KDQpBcHBsaWVkIHRvIGh0dHBzOi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9rZXJu
ZWwvZ2l0L210ZC9saW51eC5naXQsDQpzcGktbm9yL25leHQgYnJhbmNoLg0KDQpUaGFua3MsDQp0
YQ0K
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-21 8:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-15 8:32 [PATCH] mtd: spi-nor: Fix an error code in spi_nor_read_raw() Dan Carpenter
2019-08-15 10:35 ` walter harms
2019-08-15 14:41 ` Dan Carpenter
2019-08-21 7:35 ` Tudor.Ambarus
2019-08-21 8:21 ` Tudor.Ambarus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).