From: <darinzon@amazon•com>
To: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, <netdev@vger•kernel.org>
Cc: David Arinzon <darinzon@amazon•com>,
"Woodhouse, David" <dwmw@amazon•com>,
"Machulsky, Zorik" <zorik@amazon•com>,
"Matushevsky, Alexander" <matua@amazon•com>,
Saeed Bshara <saeedb@amazon•com>, "Wilson, Matt" <msw@amazon•com>,
"Liguori, Anthony" <aliguori@amazon•com>,
"Bshara, Nafea" <nafea@amazon•com>,
"Belgazal, Netanel" <netanel@amazon•com>,
"Saidi, Ali" <alisaidi@amazon•com>,
"Herrenschmidt, Benjamin" <benh@amazon•com>,
"Kiyanovski, Arthur" <akiyano@amazon•com>,
"Dagan, Noam" <ndagan@amazon•com>,
"Agroskin, Shay" <shayagr@amazon•com>,
"Itzko, Shahar" <itzko@amazon•com>,
"Abboud, Osama" <osamaabb@amazon•com>,
"Ostrovsky, Evgeny" <evostrov@amazon•com>,
"Tabachnik, Ofir" <ofirt@amazon•com>
Subject: [PATCH v1 net-next 4/6] net: ena: Changes around strscpy calls
Date: Mon, 6 May 2024 07:04:51 +0000 [thread overview]
Message-ID: <20240506070453.17054-5-darinzon@amazon.com> (raw)
In-Reply-To: <20240506070453.17054-1-darinzon@amazon.com>
From: David Arinzon <darinzon@amazon•com>
strscpy copies as much of the string as possible,
meaning that the destination string will be truncated
in case of no space. As this is a non-critical error in
our case, adding a debug level print for indication.
This patch also removes a -1 which was added to ensure
enough space for NUL, but strscpy destination string is
guaranteed to be NUL-terminted, therefore, the -1 is
not needed.
Signed-off-by: David Arinzon <darinzon@amazon•com>
---
drivers/net/ethernet/amazon/ena/ena_ethtool.c | 16 ++++++++++++----
drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 +++++++++++++----
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 28583db8..b24cc3f0 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -460,10 +460,18 @@ static void ena_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
struct ena_adapter *adapter = netdev_priv(dev);
-
- strscpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
- strscpy(info->bus_info, pci_name(adapter->pdev),
- sizeof(info->bus_info));
+ ssize_t ret = 0;
+
+ ret = strscpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
+ if (ret < 0)
+ netif_dbg(adapter, drv, dev,
+ "module name will be truncated, status = %zd\n", ret);
+
+ ret = strscpy(info->bus_info, pci_name(adapter->pdev),
+ sizeof(info->bus_info));
+ if (ret < 0)
+ netif_dbg(adapter, drv, dev,
+ "bus info will be truncated, status = %zd\n", ret);
}
static void ena_get_ringparam(struct net_device *netdev,
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index c17a9833..53f1000f 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2703,6 +2703,7 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pd
{
struct device *dev = &pdev->dev;
struct ena_admin_host_info *host_info;
+ ssize_t ret;
int rc;
/* Allocate only the host info */
@@ -2717,11 +2718,19 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pd
host_info->bdf = pci_dev_id(pdev);
host_info->os_type = ENA_ADMIN_OS_LINUX;
host_info->kernel_ver = LINUX_VERSION_CODE;
- strscpy(host_info->kernel_ver_str, utsname()->version,
- sizeof(host_info->kernel_ver_str) - 1);
+ ret = strscpy(host_info->kernel_ver_str, utsname()->version,
+ sizeof(host_info->kernel_ver_str));
+ if (ret < 0)
+ dev_dbg(dev,
+ "kernel version string will be truncated, status = %zd\n", ret);
+
host_info->os_dist = 0;
- strscpy(host_info->os_dist_str, utsname()->release,
- sizeof(host_info->os_dist_str));
+ ret = strscpy(host_info->os_dist_str, utsname()->release,
+ sizeof(host_info->os_dist_str));
+ if (ret < 0)
+ dev_dbg(dev,
+ "OS distribution string will be truncated, status = %zd\n", ret);
+
host_info->driver_version =
(DRV_MODULE_GEN_MAJOR) |
(DRV_MODULE_GEN_MINOR << ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |
--
2.40.1
next prev parent reply other threads:[~2024-05-06 7:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 7:04 [PATCH v1 net-next 0/6] ENA driver changes May 2024 darinzon
2024-05-06 7:04 ` [PATCH v1 net-next 1/6] net: ena: Add a counter for driver's reset failures darinzon
2024-05-06 7:04 ` [PATCH v1 net-next 2/6] net: ena: Reduce holes in ena_com structures darinzon
2024-05-06 7:04 ` [PATCH v1 net-next 3/6] net: ena: Add validation for completion descriptors consistency darinzon
2024-05-08 2:33 ` Jakub Kicinski
2024-05-08 6:01 ` Arinzon, David
2024-05-06 7:04 ` darinzon [this message]
2024-05-06 7:04 ` [PATCH v1 net-next 5/6] net: ena: Change initial rx_usec interval darinzon
2024-05-06 7:04 ` [PATCH v1 net-next 6/6] net: ena: Add a field for no interrupt moderation update action darinzon
2024-05-08 2:31 ` Jakub Kicinski
2024-05-08 5:55 ` Arinzon, David
2024-05-08 15:33 ` Jakub Kicinski
2024-05-09 7:25 ` Arinzon, David
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=20240506070453.17054-5-darinzon@amazon.com \
--to=darinzon@amazon$(echo .)com \
--cc=akiyano@amazon$(echo .)com \
--cc=aliguori@amazon$(echo .)com \
--cc=alisaidi@amazon$(echo .)com \
--cc=benh@amazon$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dwmw@amazon$(echo .)com \
--cc=evostrov@amazon$(echo .)com \
--cc=itzko@amazon$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=matua@amazon$(echo .)com \
--cc=msw@amazon$(echo .)com \
--cc=nafea@amazon$(echo .)com \
--cc=ndagan@amazon$(echo .)com \
--cc=netanel@amazon$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ofirt@amazon$(echo .)com \
--cc=osamaabb@amazon$(echo .)com \
--cc=saeedb@amazon$(echo .)com \
--cc=shayagr@amazon$(echo .)com \
--cc=zorik@amazon$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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