summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHimadri Pandya <himadrispandya@gmail.com>2020-08-27 08:53:55 +0200
committerDavid S. Miller <davem@davemloft.net>2020-08-27 16:37:19 +0200
commita092b7233f0e000cc6f2c71a49e2ecc6f917a5fc (patch)
treeb676da347ea739a29c346b541758456433192931
parentMerge branch 'net-fix-netpoll-crash-with-bnxt' (diff)
downloadlinux-a092b7233f0e000cc6f2c71a49e2ecc6f917a5fc.tar.xz
linux-a092b7233f0e000cc6f2c71a49e2ecc6f917a5fc.zip
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: syzbot+a7e220df5a81d1ab400e@syzkaller.appspotmail.com Signed-off-by: Himadri Pandya <himadrispandya@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/asix_common.c2
1 files changed, 1 insertions, 1 deletions
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;
}