]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: usb: asix: ax88772: Increase phy_name size
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 24 Mar 2025 14:39:30 +0000 (16:39 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 25 Mar 2025 21:35:32 +0000 (14:35 -0700)
GCC compiler (Debian 14.2.0-17) is not happy about printing
into a too short buffer (when build with `make W=1`):

 drivers/net/usb/ax88172a.c:311:9: note: ‘snprintf’ output between 4 and 66 bytes into a destination of size 20

Indeed, the buffer size is chosen based on some assumptions,
while in general the assigned name might not fit. Increase
the buffer size to cover the minimum required one. With that,
change snprintf() to use sizeof() instead of the hard coded
value.

While at it, make sure that the PHY address is not bigger than
the allowed maximum.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20250324144751.1271761-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/ax88172a.c

index e47bb125048d47945af8883691e71fdfbf12e106..f613e4bc68c8512a1186b8c5d240e7d1aab0b730 100644 (file)
@@ -18,8 +18,8 @@
 struct ax88172a_private {
        struct mii_bus *mdio;
        struct phy_device *phydev;
-       char phy_name[20];
-       u16 phy_addr;
+       char phy_name[PHY_ID_SIZE];
+       u8 phy_addr;
        u16 oldmode;
        int use_embdphy;
        struct asix_rx_fixup_info rx_fixup_info;
@@ -210,7 +210,11 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
        ret = asix_read_phy_addr(dev, priv->use_embdphy);
        if (ret < 0)
                goto free;
-
+       if (ret >= PHY_MAX_ADDR) {
+               netdev_err(dev->net, "Invalid PHY address %#x\n", ret);
+               ret = -ENODEV;
+               goto free;
+       }
        priv->phy_addr = ret;
 
        ax88172a_reset_phy(dev, priv->use_embdphy);
@@ -308,7 +312,7 @@ static int ax88172a_reset(struct usbnet *dev)
                   rx_ctl);
 
        /* Connect to PHY */
-       snprintf(priv->phy_name, 20, PHY_ID_FMT,
+       snprintf(priv->phy_name, sizeof(priv->phy_name), PHY_ID_FMT,
                 priv->mdio->id, priv->phy_addr);
 
        priv->phydev = phy_connect(dev->net, priv->phy_name,