[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20251024181541.5532-1-spyjetfayed@gmail.com>
Date: Fri, 24 Oct 2025 23:45:41 +0530
From: Ankan Biswas <spyjetfayed@...il.com>
To: ajit.khaparde@...adcom.com,
sriharsha.basavapatna@...adcom.com,
somnath.kotur@...adcom.com,
andrew+netdev@...n.ch,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com
Cc: netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
skhan@...uxfoundation.org,
khalid@...nel.org,
david.hunter.linux@...il.com,
linux-kernel-mentees@...ts.linux.dev,
Ankan Biswas <spyjetfayed@...il.com>
Subject: [PATCH v3] net: ethernet: emulex: benet: fix adapter->fw_on_flash truncation warning
The benet driver copies both fw_ver (32 bytes) and fw_on_flash (32 bytes)
into ethtool_drvinfo->fw_version (32 bytes), leading to a potential
string truncation warning when built with W=1.
Store fw_on_flash in ethtool_drvinfo->erom_version instead, which some
drivers use to report secondary firmware information.
Signed-off-by: Ankan Biswas <spyjetfayed@...il.com>
---
drivers/net/ethernet/emulex/benet/be_ethtool.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index f9216326bdfe..752f838f1abf 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -221,12 +221,20 @@ static void be_get_drvinfo(struct net_device *netdev,
struct be_adapter *adapter = netdev_priv(netdev);
strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
- if (!memcmp(adapter->fw_ver, adapter->fw_on_flash, FW_VER_LEN))
+ if (!memcmp(adapter->fw_ver, adapter->fw_on_flash, FW_VER_LEN)) {
strscpy(drvinfo->fw_version, adapter->fw_ver,
sizeof(drvinfo->fw_version));
- else
- snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
- "%s [%s]", adapter->fw_ver, adapter->fw_on_flash);
+
+ } else {
+ strscpy(drvinfo->fw_version, adapter->fw_ver,
+ sizeof(drvinfo->fw_version));
+
+ /*
+ * Report fw_on_flash in ethtool's erom_version field.
+ */
+ strscpy(drvinfo->erom_version, adapter->fw_on_flash,
+ sizeof(drvinfo->erom_version));
+ }
strscpy(drvinfo->bus_info, pci_name(adapter->pdev),
sizeof(drvinfo->bus_info));
--
2.51.1
Powered by blists - more mailing lists