ibmvnic: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Mon, 9 Oct 2023 23:19:57 +0000 (23:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Oct 2023 09:18:20 +0000 (10:18 +0100)
`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 required as the buffer is already memset to 0:
|       memset(adapter->fw_version, 0, 32);

Note that another usage of strscpy exists on the same buffer:
|       strscpy((char *)adapter->fw_version, "N/A", sizeof(adapter->fw_version));

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
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ibm/ibmvnic.c

index 2094f413cbe4bd491bf3be6ef00a53b968ff0223..30c47b8470ade54794ffc4f3a006ee094084d906 100644 (file)
@@ -5247,7 +5247,8 @@ static void handle_vpd_rsp(union ibmvnic_crq *crq,
        /* copy firmware version string from vpd into adapter */
        if ((substr + 3 + fw_level_len) <
            (adapter->vpd->buff + adapter->vpd->len)) {
-               strncpy((char *)adapter->fw_version, substr + 3, fw_level_len);
+               strscpy(adapter->fw_version, substr + 3,
+                       sizeof(adapter->fw_version));
        } else {
                dev_info(dev, "FW substr extrapolated VPD buff\n");
        }