net: mvpp2: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Tue, 10 Oct 2023 21:24:42 +0000 (21:24 +0000)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 Oct 2023 00:23:42 +0000 (17:23 -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.

We expect `irqname` to be NUL-terminated based on its use with
of_irq_get_byname() -> of_property_match_string() wherein it is used
with a format string and a `strcmp`:
|       pr_debug("comparing %s with %s\n", string, p);
|       if (strcmp(string, p) == 0)
|               return i; /* Found it; return index */

NUL-padding is not required as is evident by other assignments to
`irqname` which do not NUL-pad:
|       if (port->flags & MVPP2_F_DT_COMPAT)
|               snprintf(irqname, sizeof(irqname), "tx-cpu%d", i);
|       else
|               snprintf(irqname, sizeof(irqname), "hif%d", i);

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: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20231010-strncpy-drivers-net-ethernet-marvell-mvpp2-mvpp2_main-c-v1-1-51be96ad0324@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

index f11a3f6540b03c385b65b9b4009045883e67cb08..93137606869e26e45ceeb01bcd6a7439875078f5 100644 (file)
@@ -5831,7 +5831,7 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port,
                        v->type = MVPP2_QUEUE_VECTOR_SHARED;
 
                        if (port->flags & MVPP2_F_DT_COMPAT)
-                               strncpy(irqname, "rx-shared", sizeof(irqname));
+                               strscpy(irqname, "rx-shared", sizeof(irqname));
                }
 
                if (port_node)