netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Justin Stitt <justinstitt@google.com>
To: Jesse Brandeburg <jesse.brandeburg@intel.com>,
	Tony Nguyen <anthony.l.nguyen@intel.com>,
	 "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	 Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>
Cc: linux-hardening@vger.kernel.org,
	intel-wired-lan@lists.osuosl.org,  netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	 Justin Stitt <justinstitt@google.com>
Subject: [PATCH v1 net-next 3/7] fm10k: replace deprecated strncpy with strscpy
Date: Tue, 10 Oct 2023 22:26:56 +0000	[thread overview]
Message-ID: <20231010-netdev-replace-strncpy-resend-as-series-v1-3-caf9f0f2f021@google.com> (raw)
In-Reply-To: <20231010-netdev-replace-strncpy-resend-as-series-v1-0-caf9f0f2f021@google.com>

`strncpy` is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

A suitable replacement is `strscpy` [2] due to the fact that it
guarantees NUL-termination on the destination buffer without
unnecessarily NUL-padding.

Other implementations of .*get_drvinfo also use strscpy so this patch
brings fm10k_get_drvinfo in line as well:

igb/igb_ethtool.c +851
static void igb_get_drvinfo(struct net_device *netdev,

igbvf/ethtool.c
167:static void igbvf_get_drvinfo(struct net_device *netdev,

i40e/i40e_ethtool.c
1999:static void i40e_get_drvinfo(struct net_device *netdev,

e1000/e1000_ethtool.c
529:static void e1000_get_drvinfo(struct net_device *netdev,

ixgbevf/ethtool.c
211:static void ixgbevf_get_drvinfo(struct net_device *netdev,

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2]
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>

---
Note: build-tested only.
---
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index d53369e30040..13a05604dcc0 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -448,10 +448,10 @@ static void fm10k_get_drvinfo(struct net_device *dev,
 {
 	struct fm10k_intfc *interface = netdev_priv(dev);
 
-	strncpy(info->driver, fm10k_driver_name,
-		sizeof(info->driver) - 1);
-	strncpy(info->bus_info, pci_name(interface->pdev),
-		sizeof(info->bus_info) - 1);
+	strscpy(info->driver, fm10k_driver_name,
+		sizeof(info->driver));
+	strscpy(info->bus_info, pci_name(interface->pdev),
+		sizeof(info->bus_info));
 }
 
 static void fm10k_get_pauseparam(struct net_device *dev,

-- 
2.42.0.609.gbb76f46606-goog


  parent reply	other threads:[~2023-10-10 22:27 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-10 22:26 [PATCH net-next 0/7] net: intel: replace deprecated strncpy uses Justin Stitt
2023-10-10 22:26 ` [PATCH v1 net-next 1/7] e100: replace deprecated strncpy with strscpy Justin Stitt
2023-10-10 22:26 ` [PATCH v1 net-next 2/7] e1000: " Justin Stitt
2023-10-10 22:26 ` Justin Stitt [this message]
2023-10-10 22:26 ` [PATCH v1 net-next 4/7] i40e: use scnprintf over strncpy+strncat Justin Stitt
2023-10-16  8:45   ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
2023-10-10 22:26 ` [PATCH v1 net-next 5/7] igb: replace deprecated strncpy with strscpy Justin Stitt
2023-10-16  8:42   ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
2023-10-10 22:26 ` [PATCH v1 net-next 6/7] igbvf: " Justin Stitt
2023-10-16  8:40   ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
2023-10-10 22:27 ` [PATCH v1 net-next 7/7] igc: " Justin Stitt
2023-10-16  8:37   ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
2023-10-10 23:19 ` [PATCH net-next 0/7] net: intel: replace deprecated strncpy uses Jesse Brandeburg
2023-10-10 23:22   ` Justin Stitt
2023-10-10 23:28     ` Kees Cook
2023-10-10 23:31 ` Kees Cook
2023-10-12 19:48 ` Jacob Keller

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=20231010-netdev-replace-strncpy-resend-as-series-v1-3-caf9f0f2f021@google.com \
    --to=justinstitt@google.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=kuba@kernel.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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).