Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+3
-3
+3
-3
arch/x86/kernel/setup.c
+3
-3
arch/x86/kernel/setup.c
···
903
903
904
904
#ifdef CONFIG_CMDLINE_BOOL
905
905
#ifdef CONFIG_CMDLINE_OVERRIDE
906
-
strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
906
+
strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
907
907
#else
908
908
if (builtin_cmdline[0]) {
909
909
/* append boot loader cmdline to builtin */
910
910
strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
911
911
strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);
912
-
strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
912
+
strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
913
913
}
914
914
#endif
915
915
#endif
916
916
917
-
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
917
+
strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
918
918
*cmdline_p = command_line;
919
919
920
920
/*