]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
MIPS: octeon: Replace memset(0) + deprecated strcpy() with strscpy_pad()
authorThorsten Blum <thorsten.blum@linux.dev>
Sun, 17 Aug 2025 18:37:16 +0000 (20:37 +0200)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Fri, 29 Aug 2025 20:34:30 +0000 (22:34 +0200)
Replace memset(0) followed by the deprecated strcpy() with strscpy_pad()
to improve octeon_fdt_set_phy(). This avoids zeroing the memory before
copying the string and ensures the destination buffer is only written to
once, simplifying the code and improving efficiency.

Link: https://github.com/KSPP/linux/issues/88
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Justin Stitt <justinstitt@google.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/cavium-octeon/octeon-platform.c

index 5e1dd4e6e82fb8e1438014403aeba8159ae0d468..47677b5d7ed001096b958a9f7f8088d35d630f44 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/of_fdt.h>
 #include <linux/platform_device.h>
 #include <linux/libfdt.h>
+#include <linux/string.h>
 
 #include <asm/octeon/octeon.h>
 #include <asm/octeon/cvmx-helper-board.h>
@@ -538,8 +539,7 @@ static void __init octeon_fdt_set_phy(int eth, int phy_addr)
 
        if (octeon_has_88e1145()) {
                fdt_nop_property(initial_boot_params, phy, "marvell,reg-init");
-               memset(new_name, 0, sizeof(new_name));
-               strcpy(new_name, "marvell,88e1145");
+               strscpy_pad(new_name, "marvell,88e1145");
                p = fdt_getprop(initial_boot_params, phy, "compatible",
                                &current_len);
                if (p && current_len >= strlen(new_name))