Skip to contentSkip to conversation

net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()

PATCH In review Himadri Pandya 4 participants 5 messages Aug 27, 2020 – Aug 28, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()

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: [email protected]

---
 drivers/net/usb/asix_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/asix_common.c +1 -1
index e39f41efda3e..7bc6e8f856fe 100644
@@ -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;
 	}
Signature · 6 lines
2.17.1

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
#1 lore raw

Hello!

Quoted 16 lines · 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: [email protected]

---
  drivers/net/usb/asix_common.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/asix_common.c +0 -0
index e39f41efda3e..7bc6e8f856fe 100644

drivers/net/usb/asix_common.c int asix_read_phy_addr(struct usbnet *dev, int internal) · line 300

Quoted 6 lines
drivers/net/usb/asix_common.c +1 -1
@@ -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
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#2 lore raw
Quoted 22 lines · Sergei Shtylyov

Hello!

Quoted 17 lines · 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: [email protected]

---
  drivers/net/usb/asix_common.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/asix_common.c +0 -0
index e39f41efda3e..7bc6e8f856fe 100644
@@ -296,7 +296,7 @@ int asix_read_phy_addr(struct usbnet *dev, int internal)
 
Quoted 8 lines

drivers/net/usb/asix_common.c int asix_read_phy_addr(struct usbnet *dev, int internal) · line 300

Quoted 5 lines
drivers/net/usb/asix_common.c +1 -1
      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

Quoted 3 lines

[...]

MBR, Sergei

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

maintainer
#3 lore raw
In reply to Himadri Pandya

From: Himadri Pandya <[email protected]>
Date: Thu, 27 Aug 2020 12:23:55 +0530

Quoted 7 lines

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: [email protected]

Applied, thanks.
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#4 lore raw
In reply to Himadri Pandya
Quoted 16 lines · 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: [email protected]

---
 drivers/net/usb/asix_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/asix_common.c +0 -0
index e39f41efda3e..7bc6e8f856fe 100644

drivers/net/usb/asix_common.c int asix_read_phy_addr(struct usbnet *dev, int internal) · line 302

Quoted 8 lines
drivers/net/usb/asix_common.c +1 -1
@@ -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
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees