The patch titled
Subject: init: move from strlcpy with unused retval to strscpy
has been added to the -mm mm-nonmm-unstable branch. Its filename is
init-move-from-strlcpy-with-unused-retval-to-strscpy.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/init-move-from-strlcpy-with-unused-retval-to-strscpy.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Subject: init: move from strlcpy with unused retval to strscpy
Date: Thu, 18 Aug 2022 23:01:59 +0200
Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.
Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@xxxxxxxxxxxxxx/
Link: https://lkml.kernel.org/r/20220818210200.8203-1-wsa+renesas@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/do_mounts.c | 4 ++--
init/main.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/init/do_mounts.c~init-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/init/do_mounts.c
@@ -296,7 +296,7 @@ EXPORT_SYMBOL_GPL(name_to_dev_t);
static int __init root_dev_setup(char *line)
{
- strlcpy(saved_root_name, line, sizeof(saved_root_name));
+ strscpy(saved_root_name, line, sizeof(saved_root_name));
return 1;
}
@@ -343,7 +343,7 @@ static int __init split_fs_names(char *p
int count = 1;
char *p = page;
- strlcpy(p, root_fs_names, size);
+ strscpy(p, root_fs_names, size);
while (*p++) {
if (p[-1] == ',') {
p[-1] = '\0';
--- a/init/main.c~init-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/init/main.c
@@ -423,7 +423,7 @@ static void __init setup_boot_config(voi
if (!data)
data = xbc_get_embedded_bootconfig(&size);
- strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+ strscpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
bootconfig_params);
@@ -766,7 +766,7 @@ void __init parse_early_param(void)
return;
/* All fall through to do_early_param. */
- strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+ strscpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
parse_early_options(tmp_cmdline);
done = 1;
}
_
Patches currently in -mm which might be from wsa+renesas@xxxxxxxxxxxxxxxxxxxx are
alpha-move-from-strlcpy-with-unused-retval-to-strscpy.patch
ia64-move-from-strlcpy-with-unused-retval-to-strscpy.patch
ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch
reiserfs-move-from-strlcpy-with-unused-retval-to-strscpy.patch
init-move-from-strlcpy-with-unused-retval-to-strscpy.patch
