* [PATCH] lan78xx: Correctly indicate invalid OTP
@ 2018-04-11 9:59 Phil Elwell
2018-04-11 12:57 ` Andrew Lunn
2018-04-11 14:31 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Phil Elwell @ 2018-04-11 9:59 UTC (permalink / raw)
To: Woojung Huh, Microchip Linux Driver Support, netdev, linux-usb,
linux-kernel
Cc: Phil Elwell
lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
content, but the value gets overwritten before it is returned and the
read goes ahead anyway. Make the read conditional as it should be
and preserve the error code.
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
drivers/net/usb/lan78xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 55a78eb..32cf217 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -928,7 +928,8 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
offset += 0x100;
else
ret = -EINVAL;
- ret = lan78xx_read_raw_otp(dev, offset, length, data);
+ if (!ret)
+ ret = lan78xx_read_raw_otp(dev, offset, length, data);
}
return ret;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] lan78xx: Correctly indicate invalid OTP
2018-04-11 9:59 [PATCH] lan78xx: Correctly indicate invalid OTP Phil Elwell
@ 2018-04-11 12:57 ` Andrew Lunn
2018-04-11 13:03 ` Phil Elwell
2018-04-11 14:31 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Lunn @ 2018-04-11 12:57 UTC (permalink / raw)
To: Phil Elwell
Cc: Woojung Huh, Microchip Linux Driver Support, netdev, linux-usb,
linux-kernel
On Wed, Apr 11, 2018 at 10:59:17AM +0100, Phil Elwell wrote:
> lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
> content, but the value gets overwritten before it is returned and the
> read goes ahead anyway. Make the read conditional as it should be
> and preserve the error code.
Hi Phil
Do you know that the Fixes: tag should be for this? When did it break?
Thanks
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] lan78xx: Correctly indicate invalid OTP
2018-04-11 12:57 ` Andrew Lunn
@ 2018-04-11 13:03 ` Phil Elwell
0 siblings, 0 replies; 4+ messages in thread
From: Phil Elwell @ 2018-04-11 13:03 UTC (permalink / raw)
To: Andrew Lunn
Cc: Woojung Huh, Microchip Linux Driver Support, netdev, linux-usb,
linux-kernel
Hi Andrew.
On 11/04/2018 13:57, Andrew Lunn wrote:
> On Wed, Apr 11, 2018 at 10:59:17AM +0100, Phil Elwell wrote:
>> lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
>> content, but the value gets overwritten before it is returned and the
>> read goes ahead anyway. Make the read conditional as it should be
>> and preserve the error code.
>
> Hi Phil
>
> Do you know that the Fixes: tag should be for this? When did it break?
It's been broken since day 1, so:
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] lan78xx: Correctly indicate invalid OTP
2018-04-11 9:59 [PATCH] lan78xx: Correctly indicate invalid OTP Phil Elwell
2018-04-11 12:57 ` Andrew Lunn
@ 2018-04-11 14:31 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2018-04-11 14:31 UTC (permalink / raw)
To: phil; +Cc: woojung.huh, UNGLinuxDriver, netdev, linux-usb, linux-kernel
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 11 Apr 2018 10:59:17 +0100
> lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
> content, but the value gets overwritten before it is returned and the
> read goes ahead anyway. Make the read conditional as it should be
> and preserve the error code.
>
> Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Applied with appropriate Fixes: tag added, and queud up for -stable.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-11 14:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-11 9:59 [PATCH] lan78xx: Correctly indicate invalid OTP Phil Elwell
2018-04-11 12:57 ` Andrew Lunn
2018-04-11 13:03 ` Phil Elwell
2018-04-11 14:31 ` David Miller
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).