From: Qasim Ijaz <qasdev00@gmail.com>
To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
syzbot+3361c2d6f78a3e0892f9@syzkaller.appspotmail.com,
stable@vger.kernel.org
Cc: Qasim Ijaz <qasdev00@gmail.com>
Subject: [PATCH 1/5] net: ch9200: fix uninitialised access bug during mii_nway_restart
Date: Sat, 12 Apr 2025 19:38:25 +0100 [thread overview]
Message-ID: <20250412183829.41342-2-qasdev00@gmail.com> (raw)
In-Reply-To: <20250412183829.41342-1-qasdev00@gmail.com>
In mii_nway_restart() during the line:
bmcr = mii->mdio_read(mii->dev, mii->phy_id, MII_BMCR);
The code attempts to call mii->mdio_read which is ch9200_mdio_read().
ch9200_mdio_read() utilises a local buffer, which is initialised
with control_read():
unsigned char buff[2];
However buff is conditionally initialised inside control_read():
if (err == size) {
memcpy(data, buf, size);
}
If the condition of "err == size" is not met, then buff remains
uninitialised. Once this happens the uninitialised buff is accessed
and returned during ch9200_mdio_read():
return (buff[0] | buff[1] << 8);
The problem stems from the fact that ch9200_mdio_read() ignores the
return value of control_read(), leading to uinit-access of buff.
To fix this we should check the return value of control_read()
and return early on error. We return 0 on control_read() failure here
because returning a negative may trigger the "bmcr & BMCR_ANENABLE"
check within mii_nway_restart.
Reported-by: syzbot <syzbot+3361c2d6f78a3e0892f9@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=3361c2d6f78a3e0892f9
Tested-by: syzbot <syzbot+3361c2d6f78a3e0892f9@syzkaller.appspotmail.com>
Fixes: 4a476bd6d1d9 ("usbnet: New driver for QinHeng CH9200 devices")
Cc: stable@vger.kernel.org
Signed-off-by: Qasim Ijaz <qasdev00@gmail.com>
---
drivers/net/usb/ch9200.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/ch9200.c b/drivers/net/usb/ch9200.c
index f69d9b902da0..4f29ecf2240a 100644
--- a/drivers/net/usb/ch9200.c
+++ b/drivers/net/usb/ch9200.c
@@ -178,6 +178,7 @@ static int ch9200_mdio_read(struct net_device *netdev, int phy_id, int loc)
{
struct usbnet *dev = netdev_priv(netdev);
unsigned char buff[2];
+ int ret;
netdev_dbg(netdev, "%s phy_id:%02x loc:%02x\n",
__func__, phy_id, loc);
@@ -185,8 +186,10 @@ static int ch9200_mdio_read(struct net_device *netdev, int phy_id, int loc)
if (phy_id != 0)
return -ENODEV;
- control_read(dev, REQUEST_READ, 0, loc * 2, buff, 0x02,
- CONTROL_TIMEOUT_MS);
+ ret = control_read(dev, REQUEST_READ, 0, loc * 2, buff, 0x02,
+ CONTROL_TIMEOUT_MS);
+ if (ret < 0)
+ return 0;
return (buff[0] | buff[1] << 8);
}
--
2.39.5
next prev parent reply other threads:[~2025-04-12 18:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-12 18:38 [PATCH 0/5] net: ch9200: fix various bugs and improve qinheng ch9200 driver Qasim Ijaz
2025-04-12 18:38 ` Qasim Ijaz [this message]
2025-04-15 1:28 ` [PATCH 1/5] net: ch9200: fix uninitialised access bug during mii_nway_restart Andrew Lunn
2025-04-12 18:38 ` [PATCH 2/5] net: ch9200: remove extraneous return that prevents error propagation Qasim Ijaz
2025-04-12 18:38 ` [PATCH 3/5] net: ch9200: fail fast on control_read() failures during get_mac_address() Qasim Ijaz
2025-04-12 18:38 ` [PATCH 4/5] net: ch9200: add missing error handling in ch9200_bind() Qasim Ijaz
2025-04-16 3:47 ` Jakub Kicinski
2025-04-17 13:07 ` Qasim Ijaz
2025-04-12 18:38 ` [PATCH 5/5] net: ch9200: avoid triggering NWay restart on non-zero PHY ID Qasim Ijaz
2025-04-15 1:35 ` Andrew Lunn
2025-04-16 3:52 ` Jakub Kicinski
2025-04-16 3:56 ` Jakub Kicinski
2025-04-17 13:12 ` Qasim Ijaz
2025-04-17 14:08 ` Andrew Lunn
2025-04-17 17:27 ` Qasim Ijaz
2025-04-25 10:13 ` Qasim Ijaz
2025-04-28 14:22 ` Andrew Lunn
2025-04-30 17:57 ` Qasim Ijaz
2025-05-09 15:21 ` Qasim Ijaz
2025-05-19 9:58 ` Qasim Ijaz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250412183829.41342-2-qasdev00@gmail.com \
--to=qasdev00@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+3361c2d6f78a3e0892f9@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).