Skip to content

Commit

Permalink
xtensa: use strscpy to copy strings
Browse files Browse the repository at this point in the history
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 <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Max Filippov <[email protected]>
  • Loading branch information
Jason Wang authored and jcmvbkbc committed Mar 7, 2022
1 parent b8f9a9a commit 9ddef26
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/xtensa/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);

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;
}

Expand Down Expand Up @@ -230,7 +230,7 @@ void __init early_init_devtree(void *params)
of_scan_flat_dt(xtensa_dt_io_area, NULL);

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 */
Expand Down Expand Up @@ -260,7 +260,7 @@ void __init init_arch(bp_tag_t *bp_start)

#ifdef CONFIG_CMDLINE_BOOL
if (!command_line[0])
strlcpy(command_line, default_command_line, COMMAND_LINE_SIZE);
strscpy(command_line, default_command_line, COMMAND_LINE_SIZE);
#endif

/* Early hook for platforms */
Expand Down Expand Up @@ -289,7 +289,7 @@ void __init setup_arch(char **cmdline_p)

*cmdline_p = command_line;
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 */

Expand Down

0 comments on commit 9ddef26

Please sign in to comment.