mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
xtensa: use strscpy to copy strings
The strlcpy should not be used because it doesn't limit the source length. So that it will lead some potential bugs. But the strscpy doesn't require reading memory from the src string beyond the specified "count" bytes, and since the return value is easier to error-check than strlcpy()'s. In addition, the implementation is robust to the string changing out from underneath it, unlike the current strlcpy() implementation. Thus, replace strlcpy with strscpy. Signed-off-by: Jason Wang <wangborong@cdjrlc.com> Message-Id: <20211220084756.955307-1-wangborong@cdjrlc.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
parent
b8f9a9aa02
commit
9ddef266bc
1 changed files with 4 additions and 4 deletions
|
@ -140,7 +140,7 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);
|
||||||
|
|
||||||
static int __init parse_tag_cmdline(const bp_tag_t* tag)
|
static int __init parse_tag_cmdline(const bp_tag_t* tag)
|
||||||
{
|
{
|
||||||
strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);
|
strscpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,7 +230,7 @@ void __init early_init_devtree(void *params)
|
||||||
of_scan_flat_dt(xtensa_dt_io_area, NULL);
|
of_scan_flat_dt(xtensa_dt_io_area, NULL);
|
||||||
|
|
||||||
if (!command_line[0])
|
if (!command_line[0])
|
||||||
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
|
strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_USE_OF */
|
#endif /* CONFIG_USE_OF */
|
||||||
|
@ -260,7 +260,7 @@ void __init init_arch(bp_tag_t *bp_start)
|
||||||
|
|
||||||
#ifdef CONFIG_CMDLINE_BOOL
|
#ifdef CONFIG_CMDLINE_BOOL
|
||||||
if (!command_line[0])
|
if (!command_line[0])
|
||||||
strlcpy(command_line, default_command_line, COMMAND_LINE_SIZE);
|
strscpy(command_line, default_command_line, COMMAND_LINE_SIZE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Early hook for platforms */
|
/* Early hook for platforms */
|
||||||
|
@ -289,7 +289,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
|
|
||||||
*cmdline_p = command_line;
|
*cmdline_p = command_line;
|
||||||
platform_setup(cmdline_p);
|
platform_setup(cmdline_p);
|
||||||
strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
|
strscpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
|
||||||
|
|
||||||
/* Reserve some memory regions */
|
/* Reserve some memory regions */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue