2022-06-06 03:58:01

by Thomas Gleixner

Subject: [GIT pull] x86/boot for v5.19-rc1

Linus,

please pull the latest x86/boot branch from:

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

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


Use strlcpy() instead of strscpy() in arch_setup()

Thanks,

tglx

------------------>
XueBing Chen (1):
x86/setup: Use strscpy() to replace deprecated strlcpy()


arch/x86/kernel/setup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 249981bf3d8a..3ebb85327edb 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -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;

/*

2022-06-06 04:31:55

by pr-tracker-bot

Subject: Re: [GIT pull] x86/boot for v5.19-rc1

The pull request you sent on Sun, 5 Jun 2022 11:30:58 +0200 (CEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-2022-06-05

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1fd9f4ce8442e34d4f817924d191d2855cdb80c5

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html