Commit be39d0a6 authored by Justin Stitt's avatar Justin Stitt Committed by Jakub Kicinski
Browse files

i40e: use scnprintf over strncpy+strncat 

`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


Signed-off-by: default avatarJustin Stitt <justinstitt@google.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231017190411.2199743-7-jacob.e.keller@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 48b23846

drivers/net/ethernet/intel/i40e/i40e_ddp.c

+3 −4
Original line number Diff line number Diff line
@@ -456,10 +456,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);