Commit 1fd9f4ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-boot-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot update from Thomas Gleixner:
 "Use strlcpy() instead of strscpy() in arch_setup()"

* tag 'x86-boot-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/setup: Use strscpy() to replace deprecated strlcpy()
parents c049ecc5 8a33d96b

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;



	/*