ionic: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Wed, 11 Oct 2023 21:53:44 +0000 (21:53 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 14 Oct 2023 00:10:36 +0000 (17:10 -0700)
strncpy() is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

NUL-padding is not needed due to `ident` being memset'd to 0 just before
the copy.

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

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20231011-strncpy-drivers-net-ethernet-pensando-ionic-ionic_main-c-v1-1-23c62a16ff58@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/pensando/ionic/ionic_main.c

index 1dc79cecc5cc146add25b86392f06e54020ff3be..835577392178913d9aa9eb8d5a9ea055f9103102 100644 (file)
@@ -554,8 +554,8 @@ int ionic_identify(struct ionic *ionic)
        memset(ident, 0, sizeof(*ident));
 
        ident->drv.os_type = cpu_to_le32(IONIC_OS_TYPE_LINUX);
-       strncpy(ident->drv.driver_ver_str, UTS_RELEASE,
-               sizeof(ident->drv.driver_ver_str) - 1);
+       strscpy(ident->drv.driver_ver_str, UTS_RELEASE,
+               sizeof(ident->drv.driver_ver_str));
 
        mutex_lock(&ionic->dev_cmd_lock);