From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>
Subject: [PATCH net v2 2/2] net: usb: asix: ax88772: Increase phy_name size
Date: Wed, 19 Mar 2025 12:54:34 +0200 [thread overview]
Message-ID: <20250319105813.3102076-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20250319105813.3102076-1-andriy.shevchenko@linux.intel.com>
GCC compiler (Debian 14.2.0-17) is not happy about printing
into a short buffer (when build with `make W=1`):
drivers/net/usb/ax88172a.c: In function ‘ax88172a_reset’:
include/linux/phy.h:312:20: error: ‘%s’ directive output may be truncated writing up to 60 bytes into a region of size 20 [-Werror=format-truncation=]
Indeed, the buffer size is chosen based on some assumptions, while
in general the assigned name might not fit. Increase the buffer to
cover maximum length of the parameters. With that, change snprintf()
to use sizeof() instead of hard coded number.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/net/usb/ax88172a.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index e47bb125048d..df00c62dd538 100644
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -18,7 +18,7 @@
struct ax88172a_private {
struct mii_bus *mdio;
struct phy_device *phydev;
- char phy_name[20];
+ char phy_name[MII_BUS_ID_SIZE + 3];
u16 phy_addr;
u16 oldmode;
int use_embdphy;
@@ -210,7 +210,10 @@ 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 ID %x\n", ret);
+ return -ENODEV;
+ }
priv->phy_addr = ret;
ax88172a_reset_phy(dev, priv->use_embdphy);
@@ -308,7 +311,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,
--
2.47.2
next prev parent reply other threads:[~2025-03-19 10:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-19 10:54 [PATCH net v2 0/2] net: phy: Fix potential string cut when using PHY_ID_FMT Andy Shevchenko
2025-03-19 10:54 ` [PATCH net v2 1/2] net: phy: Fix formatting specifier to avoid potential string cuts Andy Shevchenko
2025-03-19 11:21 ` Andy Shevchenko
2025-03-19 15:37 ` kernel test robot
2025-03-19 15:52 ` Andy Shevchenko
2025-03-19 15:46 ` Russell King (Oracle)
2025-03-19 16:16 ` Andy Shevchenko
2025-03-19 17:27 ` kernel test robot
2025-03-19 10:54 ` Andy Shevchenko [this message]
2025-03-19 11:26 ` [PATCH net v2 2/2] net: usb: asix: ax88772: Increase phy_name size Andy Shevchenko
2025-03-19 14:43 ` Russell King (Oracle)
2025-03-19 16:22 ` Andy Shevchenko
2025-03-19 17:13 ` Russell King (Oracle)
2025-03-19 18:36 ` Andy Shevchenko
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=20250319105813.3102076-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).