Skip to content

Commit a1e077a

Browse files
deepanshu406Paolo Abeni
authored andcommitted
net: usb: asix: validate PHY address before use
The ASIX driver reads the PHY address from the USB device via asix_read_phy_addr(). A malicious or faulty device can return an invalid address (>= PHY_MAX_ADDR), which causes a warning in mdiobus_get_phy(): addr 207 out of range WARNING: drivers/net/phy/mdio_bus.c:76 Validate the PHY address in asix_read_phy_addr() and remove the now-redundant check in ax88172a.c. Reported-by: syzbot+3d43c9066a5b54902232@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3d43c9066a5b54902232 Tested-by: syzbot+3d43c9066a5b54902232@syzkaller.appspotmail.com Fixes: 7e88b11 ("net: usb: asix: refactor asix_read_phy_addr() and handle errors on return") Link: https://lore.kernel.org/all/20251217085057.270704-1-kartikey406@gmail.com/T/ [v1] Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://patch.msgid.link/20251218011156.276824-1-kartikey406@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent a4f800c commit a1e077a

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

drivers/net/usb/asix_common.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,11 @@ int asix_read_phy_addr(struct usbnet *dev, bool internal)
335335
offset = (internal ? 1 : 0);
336336
ret = buf[offset];
337337

338+
if (ret >= PHY_MAX_ADDR) {
339+
netdev_err(dev->net, "invalid PHY address: %d\n", ret);
340+
return -ENODEV;
341+
}
342+
338343
netdev_dbg(dev->net, "%s PHY address 0x%x\n",
339344
internal ? "internal" : "external", ret);
340345

drivers/net/usb/ax88172a.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
210210
ret = asix_read_phy_addr(dev, priv->use_embdphy);
211211
if (ret < 0)
212212
goto free;
213-
if (ret >= PHY_MAX_ADDR) {
214-
netdev_err(dev->net, "Invalid PHY address %#x\n", ret);
215-
ret = -ENODEV;
216-
goto free;
217-
}
213+
218214
priv->phy_addr = ret;
219215

220216
ax88172a_reset_phy(dev, priv->use_embdphy);

0 commit comments

Comments
 (0)