* [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
@ 2020-08-27 6:53 ` Himadri Pandya
0 siblings, 0 replies; 10+ messages in thread
From: Himadri Pandya @ 2020-08-27 6:53 UTC (permalink / raw)
To: davem, kuba
Cc: linux-usb, netdev, linux-kernel, syzkaller-bugs,
linux-kernel-mentees, gregkh, Himadri Pandya
The buffer size is 2 Bytes and we expect to receive the same amount of
data. But sometimes we receive less data and run into uninit-was-stored
issue upon read. Hence modify the error check on the return value to match
with the buffer size as a prevention.
Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
---
drivers/net/usb/asix_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index e39f41efda3e..7bc6e8f856fe 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
netdev_dbg(dev->net, "asix_get_phy_addr()\n");
- if (ret < 0) {
+ if (ret < 2) {
netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
goto out;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Linux-kernel-mentees] [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
2020-08-27 6:53 ` Himadri Pandya
@ 2020-08-27 7:57 ` Sergei Shtylyov
-1 siblings, 0 replies; 10+ messages in thread
From: Sergei Shtylyov @ 2020-08-27 7:57 UTC (permalink / raw)
To: Himadri Pandya, davem, kuba
Cc: netdev, linux-usb, syzkaller-bugs, linux-kernel,
linux-kernel-mentees
Hello!
On 27.08.2020 9:53, Himadri Pandya wrote:
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> ---
> drivers/net/usb/asix_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> index e39f41efda3e..7bc6e8f856fe 100644
> --- a/drivers/net/usb/asix_common.c
> +++ b/drivers/net/usb/asix_common.c
> @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
>
> netdev_dbg(dev->net, "asix_get_phy_addr()\n");
>
> - if (ret < 0) {
> + if (ret < 2) {
> netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
Hm... printing possibly negative values as hex?
[...]
MBR, Sergei
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
@ 2020-08-27 7:57 ` Sergei Shtylyov
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Shtylyov @ 2020-08-27 7:57 UTC (permalink / raw)
To: Himadri Pandya, davem, kuba
Cc: linux-usb, netdev, linux-kernel, syzkaller-bugs,
linux-kernel-mentees, gregkh
Hello!
On 27.08.2020 9:53, Himadri Pandya wrote:
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> ---
> drivers/net/usb/asix_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> index e39f41efda3e..7bc6e8f856fe 100644
> --- a/drivers/net/usb/asix_common.c
> +++ b/drivers/net/usb/asix_common.c
> @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
>
> netdev_dbg(dev->net, "asix_get_phy_addr()\n");
>
> - if (ret < 0) {
> + if (ret < 2) {
> netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
Hm... printing possibly negative values as hex?
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Linux-kernel-mentees] [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
2020-08-27 7:57 ` Sergei Shtylyov
@ 2020-08-28 11:06 ` Himadri Pandya
-1 siblings, 0 replies; 10+ messages in thread
From: Himadri Pandya @ 2020-08-28 11:06 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: netdev, USB list, syzkaller-bugs, LKML, Jakub Kicinski,
linux-kernel-mentees, David Miller
On Thu, Aug 27, 2020 at 1:28 PM Sergei Shtylyov
<sergei.shtylyov@gmail.com> wrote:
>
> Hello!
>
> On 27.08.2020 9:53, Himadri Pandya wrote:
>
> > The buffer size is 2 Bytes and we expect to receive the same amount of
> > data. But sometimes we receive less data and run into uninit-was-stored
> > issue upon read. Hence modify the error check on the return value to match
> > with the buffer size as a prevention.
> >
> > Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> > Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> > ---
> > drivers/net/usb/asix_common.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> > index e39f41efda3e..7bc6e8f856fe 100644
> > --- a/drivers/net/usb/asix_common.c
> > +++ b/drivers/net/usb/asix_common.c
> > @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
> >
> > netdev_dbg(dev->net, "asix_get_phy_addr()\n");
> >
> > - if (ret < 0) {
> > + if (ret < 2) {
> > netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
>
> Hm... printing possibly negative values as hex?
>
Yeah. That's odd! Fixing it.
Thanks,
Himadri
> [...]
>
> MBR, Sergei
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
@ 2020-08-28 11:06 ` Himadri Pandya
0 siblings, 0 replies; 10+ messages in thread
From: Himadri Pandya @ 2020-08-28 11:06 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: David Miller, Jakub Kicinski, USB list, netdev, LKML,
syzkaller-bugs, linux-kernel-mentees, Greg KH
On Thu, Aug 27, 2020 at 1:28 PM Sergei Shtylyov
<sergei.shtylyov@gmail.com> wrote:
>
> Hello!
>
> On 27.08.2020 9:53, Himadri Pandya wrote:
>
> > The buffer size is 2 Bytes and we expect to receive the same amount of
> > data. But sometimes we receive less data and run into uninit-was-stored
> > issue upon read. Hence modify the error check on the return value to match
> > with the buffer size as a prevention.
> >
> > Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> > Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> > ---
> > drivers/net/usb/asix_common.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> > index e39f41efda3e..7bc6e8f856fe 100644
> > --- a/drivers/net/usb/asix_common.c
> > +++ b/drivers/net/usb/asix_common.c
> > @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
> >
> > netdev_dbg(dev->net, "asix_get_phy_addr()\n");
> >
> > - if (ret < 0) {
> > + if (ret < 2) {
> > netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
>
> Hm... printing possibly negative values as hex?
>
Yeah. That's odd! Fixing it.
Thanks,
Himadri
> [...]
>
> MBR, Sergei
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
2020-08-27 6:53 ` Himadri Pandya
@ 2020-08-27 14:37 ` David Miller
-1 siblings, 0 replies; 10+ messages in thread
From: David Miller @ 2020-08-27 14:37 UTC (permalink / raw)
To: himadrispandya
Cc: netdev, linux-usb, syzkaller-bugs, linux-kernel, kuba,
linux-kernel-mentees
From: Himadri Pandya <himadrispandya@gmail.com>
Date: Thu, 27 Aug 2020 12:23:55 +0530
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
Applied, thanks.
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
@ 2020-08-27 14:37 ` David Miller
0 siblings, 0 replies; 10+ messages in thread
From: David Miller @ 2020-08-27 14:37 UTC (permalink / raw)
To: himadrispandya
Cc: kuba, linux-usb, netdev, linux-kernel, syzkaller-bugs,
linux-kernel-mentees, gregkh
From: Himadri Pandya <himadrispandya@gmail.com>
Date: Thu, 27 Aug 2020 12:23:55 +0530
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
2020-08-27 6:53 ` Himadri Pandya
@ 2020-08-27 17:52 ` Eric Biggers
-1 siblings, 0 replies; 10+ messages in thread
From: Eric Biggers @ 2020-08-27 17:52 UTC (permalink / raw)
To: Himadri Pandya
Cc: netdev, linux-usb, syzkaller-bugs, linux-kernel, kuba,
linux-kernel-mentees, davem
On Thu, Aug 27, 2020 at 12:23:55PM +0530, Himadri Pandya wrote:
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> ---
> drivers/net/usb/asix_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> index e39f41efda3e..7bc6e8f856fe 100644
> --- a/drivers/net/usb/asix_common.c
> +++ b/drivers/net/usb/asix_common.c
> @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
>
> netdev_dbg(dev->net, "asix_get_phy_addr()\n");
>
> - if (ret < 0) {
> + if (ret < 2) {
> netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
> goto out;
> }
If ret is 0 or 1 here, shouldn't asix_read_phy_addr() return an error code
instead of 0 or 1?
- Eric
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
@ 2020-08-27 17:52 ` Eric Biggers
0 siblings, 0 replies; 10+ messages in thread
From: Eric Biggers @ 2020-08-27 17:52 UTC (permalink / raw)
To: Himadri Pandya
Cc: davem, kuba, linux-usb, netdev, linux-kernel, syzkaller-bugs,
linux-kernel-mentees, gregkh
On Thu, Aug 27, 2020 at 12:23:55PM +0530, Himadri Pandya wrote:
> The buffer size is 2 Bytes and we expect to receive the same amount of
> data. But sometimes we receive less data and run into uninit-was-stored
> issue upon read. Hence modify the error check on the return value to match
> with the buffer size as a prevention.
>
> Reported-and-tested by: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com
> Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
> ---
> drivers/net/usb/asix_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> index e39f41efda3e..7bc6e8f856fe 100644
> --- a/drivers/net/usb/asix_common.c
> +++ b/drivers/net/usb/asix_common.c
> @@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
>
> netdev_dbg(dev->net, "asix_get_phy_addr()\n");
>
> - if (ret < 0) {
> + if (ret < 2) {
> netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
> goto out;
> }
If ret is 0 or 1 here, shouldn't asix_read_phy_addr() return an error code
instead of 0 or 1?
- Eric
^ permalink raw reply [flat|nested] 10+ messages in thread