In preparation to remove strlcat() from the kernel [1], replace two strlcat() calls with one snprintf() call in setup_arch().
Also drop the explicit size argument of strscpy() to further simplify the code since strscpy() can determine the size automatically when the destination buffer has a fixed length. [1] https://github.com/KSPP/linux/issues/370 Signed-off-by: Thorsten Blum <[email protected]> --- arch/x86/kernel/setup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 46882ce79c3a..b11b0ce31a27 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ #include <linux/pci.h> #include <linux/random.h> #include <linux/root_dev.h> +#include <linux/sprintf.h> #include <linux/static_call.h> #include <linux/sysfb.h> #include <linux/swiotlb.h> @@ -915,16 +916,18 @@ void __init setup_arch(char **cmdline_p) strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); #else if (builtin_cmdline[0]) { + size_t len = strnlen(builtin_cmdline, COMMAND_LINE_SIZE); + /* append boot loader cmdline to builtin */ - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); + snprintf(builtin_cmdline + len, COMMAND_LINE_SIZE - len, " %s", + boot_command_line); strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); } #endif builtin_cmdline_added = true; #endif - strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + strscpy(command_line, boot_command_line); *cmdline_p = command_line; /*
