[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <8e6f3ad3-393b-4777-a4d0-24a524aad5aa@linux-m68k.org>
Date: Mon, 28 Apr 2025 09:52:43 +1000
From: Greg Ungerer <gerg@...ux-m68k.org>
To: Thorsten Blum <thorsten.blum@...ux.dev>,
Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: linux-m68k@...ts.linux-m68k.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] m68k: Replace memcpy() + manual NUL-termination with
strscpy()
Hi Thorsten,
On 15/4/25 17:24, Thorsten Blum wrote:
> Use strscpy() to safely copy the command-line string instead of memcpy()
> followed by a manual NUL-termination.
>
> The source string is also NUL-terminated and meets the __must_be_cstr()
> requirement of strscpy().
>
> No functional changes intended.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
Thanks, applied to m68knommu git tree, for-next branch.
Regards
Greg
> ---
> arch/m68k/kernel/setup_no.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
> index f9872098f5ca..f724875b15cc 100644
> --- a/arch/m68k/kernel/setup_no.c
> +++ b/arch/m68k/kernel/setup_no.c
> @@ -145,8 +145,7 @@ void __init setup_arch(char **cmdline_p)
>
> /* Keep a copy of command line */
> *cmdline_p = &command_line[0];
> - memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
> - boot_command_line[COMMAND_LINE_SIZE-1] = 0;
> + strscpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
>
> /*
> * Give all the memory to the bootmap allocator, tell it to put the
Powered by blists - more mailing lists