summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHimadri Pandya <himadrispandya@gmail.com>2020-08-27 12:23:55 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-12 11:45:32 +0200
commit3a5455cd886649e3bd39b0fbf93b0cd0e45d05cb (patch)
tree10748e013d75e13e2d1b94b5858e2205d1bb5644
parentabe3fa074dc48a4da6d1b030a16e521221e3bb54 (diff)
downloadlinux-stable-3a5455cd886649e3bd39b0fbf93b0cd0e45d05cb.tar.gz
linux-stable-3a5455cd886649e3bd39b0fbf93b0cd0e45d05cb.tar.bz2
linux-stable-3a5455cd886649e3bd39b0fbf93b0cd0e45d05cb.zip
net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
commit a092b7233f0e000cc6f2c71a49e2ecc6f917a5fc upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 2092ef6431f2..712765976a22 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -251,7 +251,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;
}