From nobody Sat Feb 7 21:52:52 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65188264F9C for ; Fri, 24 Oct 2025 18:09:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761329384; cv=none; b=bxVzs6cvgyA5jZVb47Uf+wd5mHzLgHqqcikMgwgii35AOILU7cxj+BgyOWjsA4zECIo6yRp20dn9HEFyWsc5LOHzdtgE74ygAuWLIZHtJJSH5K8oBOmM5j6krJFefxYyDFMxUb/CUoO3h5cVIZ8fg5JGqnbOhgcYZlmYT+o/tds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761329384; c=relaxed/simple; bh=QU8xJ4i/Aw+Vyd7H8WdoblY3NJYZVZWy7OUfVpnGwS4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=O0S1fJ+5ZvMNxHyTvOMBw6bTNEZAVMCScHB79YdJpuZE0CFYJqv6BjrheRCpUWe/sBIXGRUYKa3vith4ofV2hw5ko5nWFKM3tPRUoD4stT+pM6llDhmW6agW8wlh/Eaw6zi/sSZ5/tWp0qz3vsAQ1OENS+CW6TsxmX6QDUtfaUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AaDIQ10n; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AaDIQ10n" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-781ea2cee3fso2371747b3a.0 for ; Fri, 24 Oct 2025 11:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761329382; x=1761934182; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7uYPj0SfejBh3YiQ4X3su8BApVdqBraujAWalEDiN6k=; b=AaDIQ10nHVSPD7uFXcSBTcJUUhX/+piy6ma/Goy0ErP7E1dvK7d92erzXvyGyweIhV eqv3lE38m6s4oqT87AWOVjFHg1FxkmgngpOyVtQM/Tmxizc5KoN+EShQ7BgurxcpUACF CCfUy3wbsInEsHhv2t9J/2k7Aq9CDYtGVo7hgdFsUW+SWZs1DXAg7/FU2GDqfpOCBxXV 3rQZSoOBFTJnwmC7n7PmiARwm25GgS/b/8YHm7HbkX4AwHFHv84DVGZNgENZc/Z2DUcR kURBgO8LshvP3xK/nOi2E31s9+2vaM5SZkxz2QK4lwzuNkDQev4bY9T+5ZNm8jrKKO6F i52w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761329382; x=1761934182; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7uYPj0SfejBh3YiQ4X3su8BApVdqBraujAWalEDiN6k=; b=tOgZCaxRp17HXWwUFIzY1F5/o+BevLIavXwOACHNfSNDEuwbNA2ow50QbBQAZY7d0P 2TKAU79UJTpqhVEsPQ/pNMKf0TcBQh1ApJ7Pk0sM5J2zPEVB0F1gdaW/j6Nj1MwwpqLM yThpfViIuPakI5l/2FFDXV8LjLMOQF3YjMSTnb9T2Q0HNJRMh/rI4IYapaNYTnqwvKb3 46w06zxFh6sx/WQ+F8Aip72lRsDpzNShQrqzVlTw/Wm+V9UfOaSzAgF0In167DhAnlu5 jI89+Gjee8bTWiZNUdDGjjl3wCt/kwbaMxiQcTr3/dfjbmlse/xlcnuN9E+c72U9dn/9 gmmA== X-Forwarded-Encrypted: i=1; AJvYcCUPJbh69b1WM905iNeAReSbGisFy5DPvRz/i7pGn6wwc0V3x4xiIvPtDIH+hx5wpPqBI2Q5q/NLUiMI9iM=@vger.kernel.org X-Gm-Message-State: AOJu0YxjwRWnhD6RvA8Y1H+4WppSjfQFpNcoPww+uyeFSlTewm87RoZl hEjPRI9hfwPaBYhLuUatS/dAj9QL36LQr4vobtGUimL+8q420AWzYQMQ X-Gm-Gg: ASbGncut9eYGV65k2v7sg0EVACffxjsJwACeT4NZVTyn0IbgLQHcCJfcwmaq4UiXxxp WfIVB5ZAm8BE3AoOyFqtzvaX0qgF0Zsd2jESRDetXToz0KDTdKaaRLVn4wfDmogSqbRomcjXPSR 18DTi4ggl81mYHeKcfClvD+ZM5L7u/u9UYbemSBQ+3kCzhXEvBF8My1WT1/P10TVwgvOHGkt4x/ pCN6mSiZrNLrDEbqWNjPQ31Hkzp1a+gz7o5/WKJsA2HArdhDm4JCrIriWCjc7YZt395CVrODl56 qcPwnU5hBRbMqfQskpHKyT0HmUkGc0n25MJzvAs5rryieQW6FOvsaYXd5PS5AIFI3ACN2Y3Pjx3 a7rAMx5VJXS6bN4k5u1vAC5oFqCrjwdWftX2+FlIGnCVQ64oXcHSMF4UCCiyYsea7bwdV8+5DR6 rLL8pM4DNJRScibWgo X-Google-Smtp-Source: AGHT+IEs14yzKo807oappAF1m6JTB8e3oPccYkCYJQsAbVjRETvcZutpUdb8D5Sas5c982XlhF6cwA== X-Received: by 2002:a05:6a00:99c:b0:7a2:7fd2:4132 with SMTP id d2e1a72fcca58-7a28685ed77mr3453308b3a.22.1761329381658; Fri, 24 Oct 2025 11:09:41 -0700 (PDT) Received: from tixy.nay.do ([2405:201:8000:a149:4670:c55c:fe13:754d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a274dbffacsm6679137b3a.66.2025.10.24.11.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Oct 2025 11:09:41 -0700 (PDT) From: Ankan Biswas To: ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com, somnath.kotur@broadcom.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, khalid@kernel.org, david.hunter.linux@gmail.com, linux-kernel-mentees@lists.linux.dev, Ankan Biswas Subject: [PATCH v2] net: ethernet: emulex: benet: fix adapter->fw_on_flash truncation warning Date: Fri, 24 Oct 2025 23:39:26 +0530 Message-ID: <20251024180926.3842-1-spyjetfayed@gmail.com> X-Mailer: git-send-email 2.51.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D1. Store fw_on_flash in ethtool_drvinfo->erom_version instead, which some drivers use to report secondary firmware information. Signed-off-by: Ankan Biswas --- .../net/ethernet/emulex/benet/be_ethtool.c | 100 ++++++++++-------- 1 file changed, 54 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/e= thernet/emulex/benet/be_ethtool.c index f9216326bdfe..42803999ea1d 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 =3D netdev_priv(netdev); =20 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)); + } =20 strscpy(drvinfo->bus_info, pci_name(adapter->pdev), sizeof(drvinfo->bus_info)); @@ -241,7 +249,7 @@ static u32 lancer_cmd_get_file_len(struct be_adapter *a= dapter, u8 *file_name) memset(&data_len_cmd, 0, sizeof(data_len_cmd)); /* data_offset and data_size should be 0 to get reg len */ lancer_cmd_read_object(adapter, &data_len_cmd, 0, 0, file_name, - &data_read, &eof, &addn_status); + &data_read, &eof, &addn_status); =20 return data_read; } @@ -252,7 +260,7 @@ static int be_get_dump_len(struct be_adapter *adapter) =20 if (lancer_chip(adapter)) dump_size =3D lancer_cmd_get_file_len(adapter, - LANCER_FW_DUMP_FILE); + LANCER_FW_DUMP_FILE); else dump_size =3D adapter->fat_dump_len; =20 @@ -301,13 +309,13 @@ static int lancer_cmd_read_file(struct be_adapter *ad= apter, u8 *file_name, } =20 static int be_read_dump_data(struct be_adapter *adapter, u32 dump_len, - void *buf) + void *buf) { int status =3D 0; =20 if (lancer_chip(adapter)) status =3D lancer_cmd_read_file(adapter, LANCER_FW_DUMP_FILE, - dump_len, buf); + dump_len, buf); else status =3D be_cmd_get_fat_dump(adapter, dump_len, buf); =20 @@ -635,8 +643,8 @@ static int be_get_link_ksettings(struct net_device *net= dev, =20 supported =3D convert_to_et_setting(adapter, - auto_speeds | - fixed_speeds); + auto_speeds | + fixed_speeds); advertising =3D convert_to_et_setting(adapter, auto_speeds); =20 @@ -683,9 +691,9 @@ static int be_get_link_ksettings(struct net_device *net= dev, } =20 static void be_get_ringparam(struct net_device *netdev, - struct ethtool_ringparam *ring, - struct kernel_ethtool_ringparam *kernel_ring, - struct netlink_ext_ack *extack) + struct ethtool_ringparam *ring, + struct kernel_ethtool_ringparam *kernel_ring, + struct netlink_ext_ack *extack) { struct be_adapter *adapter =3D netdev_priv(netdev); =20 @@ -737,7 +745,7 @@ static int be_set_phys_id(struct net_device *netdev, &adapter->beacon_state); if (status) return be_cmd_status(status); - return 1; /* cycle on/off once per second */ + return 1; /* cycle on/off once per second */ =20 case ETHTOOL_ID_ON: status =3D be_cmd_set_beacon_state(adapter, adapter->hba_port_num, @@ -764,7 +772,7 @@ static int be_set_dump(struct net_device *netdev, struc= t ethtool_dump *dump) int status; =20 if (!lancer_chip(adapter) || - !check_privilege(adapter, MAX_PRIVILEGES)) + !check_privilege(adapter, MAX_PRIVILEGES)) return -EOPNOTSUPP; =20 switch (dump->flag) { @@ -873,7 +881,7 @@ static int be_test_ddr_dma(struct be_adapter *adapter) } =20 static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type, - u64 *status) + u64 *status) { int ret; =20 @@ -883,7 +891,7 @@ static u64 be_loopback_test(struct be_adapter *adapter,= u8 loopback_type, return ret; =20 *status =3D be_cmd_loopback_test(adapter, adapter->hba_port_num, - loopback_type, 1500, 2, 0xabc); + loopback_type, 1500, 2, 0xabc); =20 ret =3D be_cmd_set_loopback(adapter, adapter->hba_port_num, BE_NO_LOOPBACK, 1); @@ -920,7 +928,7 @@ static void be_self_test(struct net_device *netdev, str= uct ethtool_test *test, =20 if (test->flags & ETH_TEST_FL_EXTERNAL_LB) { if (be_loopback_test(adapter, BE_ONE_PORT_EXT_LOOPBACK, - &data[2]) !=3D 0) + &data[2]) !=3D 0) test->flags |=3D ETH_TEST_FL_FAILED; test->flags |=3D ETH_TEST_FL_EXTERNAL_LB_DONE; } @@ -999,10 +1007,10 @@ static int be_get_eeprom_len(struct net_device *netd= ev) if (lancer_chip(adapter)) { if (be_physfn(adapter)) return lancer_cmd_get_file_len(adapter, - LANCER_VPD_PF_FILE); + LANCER_VPD_PF_FILE); else return lancer_cmd_get_file_len(adapter, - LANCER_VPD_VF_FILE); + LANCER_VPD_VF_FILE); } else { return BE_READ_SEEPROM_LEN; } @@ -1022,10 +1030,10 @@ static int be_read_eeprom(struct net_device *netdev, if (lancer_chip(adapter)) { if (be_physfn(adapter)) return lancer_cmd_read_file(adapter, LANCER_VPD_PF_FILE, - eeprom->len, data); + eeprom->len, data); else return lancer_cmd_read_file(adapter, LANCER_VPD_VF_FILE, - eeprom->len, data); + eeprom->len, data); } =20 eeprom->magic =3D BE_VENDOR_ID | (adapter->pdev->device<<16); @@ -1074,7 +1082,7 @@ static void be_set_msg_level(struct net_device *netde= v, u32 level) } =20 static int be_get_rxfh_fields(struct net_device *netdev, - struct ethtool_rxfh_fields *cmd) + struct ethtool_rxfh_fields *cmd) { struct be_adapter *adapter =3D netdev_priv(netdev); u64 flow_type =3D cmd->flow_type; @@ -1140,8 +1148,8 @@ static int be_get_rxnfc(struct net_device *netdev, st= ruct ethtool_rxnfc *cmd, } =20 static int be_set_rxfh_fields(struct net_device *netdev, - const struct ethtool_rxfh_fields *cmd, - struct netlink_ext_ack *extack) + const struct ethtool_rxfh_fields *cmd, + struct netlink_ext_ack *extack) { struct be_adapter *adapter =3D netdev_priv(netdev); u32 rss_flags =3D adapter->rss_info.rss_flags; @@ -1154,7 +1162,7 @@ static int be_set_rxfh_fields(struct net_device *netd= ev, } =20 if (cmd->data !=3D L3_RSS_FLAGS && - cmd->data !=3D (L3_RSS_FLAGS | L4_RSS_FLAGS)) + cmd->data !=3D (L3_RSS_FLAGS | L4_RSS_FLAGS)) return -EINVAL; =20 switch (cmd->flow_type) { @@ -1174,7 +1182,7 @@ static int be_set_rxfh_fields(struct net_device *netd= ev, break; case UDP_V4_FLOW: if ((cmd->data =3D=3D (L3_RSS_FLAGS | L4_RSS_FLAGS)) && - BEx_chip(adapter)) + BEx_chip(adapter)) return -EINVAL; =20 if (cmd->data =3D=3D L3_RSS_FLAGS) @@ -1185,7 +1193,7 @@ static int be_set_rxfh_fields(struct net_device *netd= ev, break; case UDP_V6_FLOW: if ((cmd->data =3D=3D (L3_RSS_FLAGS | L4_RSS_FLAGS)) && - BEx_chip(adapter)) + BEx_chip(adapter)) return -EINVAL; =20 if (cmd->data =3D=3D L3_RSS_FLAGS) @@ -1211,7 +1219,7 @@ static int be_set_rxfh_fields(struct net_device *netd= ev, } =20 static void be_get_channels(struct net_device *netdev, - struct ethtool_channels *ch) + struct ethtool_channels *ch) { struct be_adapter *adapter =3D netdev_priv(netdev); u16 num_rx_irqs =3D max_t(u16, adapter->num_rss_qs, 1); @@ -1237,14 +1245,14 @@ static int be_set_channels(struct net_device *netd= ev, * combined and either RX-only or TX-only channels. */ if (ch->other_count || !ch->combined_count || - (ch->rx_count && ch->tx_count)) + (ch->rx_count && ch->tx_count)) return -EINVAL; =20 if (ch->combined_count > be_max_qp_irqs(adapter) || - (ch->rx_count && - (ch->rx_count + ch->combined_count) > be_max_rx_irqs(adapter)) || - (ch->tx_count && - (ch->tx_count + ch->combined_count) > be_max_tx_irqs(adapter))) + (ch->rx_count && + (ch->rx_count + ch->combined_count) > be_max_rx_irqs(adapter)) || + (ch->tx_count && + (ch->tx_count + ch->combined_count) > be_max_tx_irqs(adapter))) return -EINVAL; =20 adapter->cfg_num_rx_irqs =3D ch->combined_count + ch->rx_count; @@ -1265,7 +1273,7 @@ static u32 be_get_rxfh_key_size(struct net_device *ne= tdev) } =20 static int be_get_rxfh(struct net_device *netdev, - struct ethtool_rxfh_param *rxfh) + struct ethtool_rxfh_param *rxfh) { struct be_adapter *adapter =3D netdev_priv(netdev); int i; @@ -1285,8 +1293,8 @@ static int be_get_rxfh(struct net_device *netdev, } =20 static int be_set_rxfh(struct net_device *netdev, - struct ethtool_rxfh_param *rxfh, - struct netlink_ext_ack *extack) + struct ethtool_rxfh_param *rxfh, + struct netlink_ext_ack *extack) { int rc =3D 0, i, j; struct be_adapter *adapter =3D netdev_priv(netdev); @@ -1295,7 +1303,7 @@ static int be_set_rxfh(struct net_device *netdev, =20 /* We do not allow change in unsupported parameters */ if (rxfh->hfunc !=3D ETH_RSS_HASH_NO_CHANGE && - rxfh->hfunc !=3D ETH_RSS_HASH_TOP) + rxfh->hfunc !=3D ETH_RSS_HASH_TOP) return -EOPNOTSUPP; =20 if (rxfh->indir) { @@ -1309,27 +1317,27 @@ static int be_set_rxfh(struct net_device *netdev, } } else { memcpy(rsstable, adapter->rss_info.rsstable, - RSS_INDIR_TABLE_LEN); + RSS_INDIR_TABLE_LEN); } =20 if (!hkey) - hkey =3D adapter->rss_info.rss_hkey; + hkey =3D adapter->rss_info.rss_hkey; =20 rc =3D be_cmd_rss_config(adapter, rsstable, - adapter->rss_info.rss_flags, - RSS_INDIR_TABLE_LEN, hkey); + adapter->rss_info.rss_flags, + RSS_INDIR_TABLE_LEN, hkey); if (rc) { adapter->rss_info.rss_flags =3D RSS_ENABLE_NONE; return -EIO; } memcpy(adapter->rss_info.rss_hkey, hkey, RSS_HASH_KEY_LEN); memcpy(adapter->rss_info.rsstable, rsstable, - RSS_INDIR_TABLE_LEN); + RSS_INDIR_TABLE_LEN); return 0; } =20 static int be_get_module_info(struct net_device *netdev, - struct ethtool_modinfo *modinfo) + struct ethtool_modinfo *modinfo) { struct be_adapter *adapter =3D netdev_priv(netdev); u8 page_data[PAGE_DATA_LEN]; @@ -1417,8 +1425,8 @@ static int be_set_priv_flags(struct net_device *netde= v, u32 flags) =20 const struct ethtool_ops be_ethtool_ops =3D { .supported_coalesce_params =3D ETHTOOL_COALESCE_USECS | - ETHTOOL_COALESCE_USE_ADAPTIVE | - ETHTOOL_COALESCE_USECS_LOW_HIGH, + ETHTOOL_COALESCE_USE_ADAPTIVE | + ETHTOOL_COALESCE_USECS_LOW_HIGH, .get_drvinfo =3D be_get_drvinfo, .get_wol =3D be_get_wol, .set_wol =3D be_set_wol, --=20 2.51.1