Commit 8a33d96b authored by XueBing Chen's avatar XueBing Chen Committed by Ingo Molnar
Browse files

x86/setup: Use strscpy() to replace deprecated strlcpy() 



strlcpy() is marked deprecated and should not be used, because
it doesn't limit the source length.

The preferred interface for when strlcpy()'s return value is not
checked (truncation) is strscpy().

[ mingo: Tweaked the changelog ]

Signed-off-by: default avatarXueBing Chen <chenxuebing@jari.cn>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/730f0fef.a33.180fa69880f.Coremail.chenxuebing@jari.cn
parent 6f3f04c1

arch/x86/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -903,18 +903,18 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_CMDLINE_BOOL

#ifdef CONFIG_CMDLINE_OVERRIDE

	strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

	strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

#else

	if (builtin_cmdline[0]) {

		/* append boot loader cmdline to builtin */

		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);

		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);

		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

		strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);

	}

#endif

#endif



	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = command_line;



	/*