Commit 2c7c8cf6 authored by Thorsten Blum's avatar Thorsten Blum Committed by Thomas Bogendoerfer
Browse files

MIPS: octeon: Replace memset(0) + deprecated strcpy() with strscpy_pad() 

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: default avatarThorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 267ac0a8

arch/mips/cavium-octeon/octeon-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -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))