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 4/7] i40e: use scnprintf over strncpy+strncat
Date: Tue, 10 Oct 2023 22:26:57 +0000	[thread overview]
Message-ID: <20231010-netdev-replace-strncpy-resend-as-series-v1-4-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.

Moreover, `strncat` shouldn't really be used either as per
fortify-string.h:
 * Do not use this function. While FORTIFY_SOURCE tries to avoid
 * read and write overflows, this is only possible when the sizes
 * of @p and @q are known to the compiler. Prefer building the
 * string with formatting, via scnprintf() or similar.

Instead, use `scnprintf` with "%s%s" format string. This code is now
more readable and robust.

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/i40e/i40e_ddp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ddp.c b/drivers/net/ethernet/intel/i40e/i40e_ddp.c
index 0e72abd178ae..ec25e4be250f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ddp.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ddp.c
@@ -438,10 +438,9 @@ int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash)
 		char profile_name[sizeof(I40E_DDP_PROFILE_PATH)
 				  + I40E_DDP_PROFILE_NAME_MAX];
 
-		profile_name[sizeof(profile_name) - 1] = 0;
-		strncpy(profile_name, I40E_DDP_PROFILE_PATH,
-			sizeof(profile_name) - 1);
-		strncat(profile_name, flash->data, I40E_DDP_PROFILE_NAME_MAX);
+		scnprintf(profile_name, sizeof(profile_name), "%s%s",
+			  I40E_DDP_PROFILE_PATH, flash->data);
+
 		/* Load DDP recipe. */
 		status = request_firmware(&ddp_config, profile_name,
 					  &netdev->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 ` [PATCH v1 net-next 3/7] fm10k: " Justin Stitt
2023-10-10 22:26 ` Justin Stitt [this message]
2023-10-16  8:45   ` [Intel-wired-lan] [PATCH v1 net-next 4/7] i40e: use scnprintf over strncpy+strncat 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-4-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).