From: Xu Panda <xu.panda@zte.com.cn>

The implementation of strscpy() is more robust and safer.

Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
---
 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 cb6def585851..37fb663559b4 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -90,8 +90,7 @@ void __init setup_arch(char **cmdline_p)
 	config_BSP(&command_line[0], sizeof(command_line));

 #if defined(CONFIG_BOOTPARAM)
-	strncpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));
-	command_line[sizeof(command_line) - 1] = 0;
+	strscpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));
 #endif /* CONFIG_BOOTPARAM */

 	process_uboot_commandline(&command_line[0], sizeof(command_line));
-- 
2.15.2

Hi Xu,

On 3/12/22 16:10, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
> 
> The implementation of strscpy() is more robust and safer.
> 
> Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> Signed-off-by: Yang Yang <yang.yang29@zte.com>

Thanks. Seeing as this is non-MMU related I'll take this through
the m68knommu git tree. Applied to the 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 cb6def585851..37fb663559b4 100644
> --- a/arch/m68k/kernel/setup_no.c
> +++ b/arch/m68k/kernel/setup_no.c
> @@ -90,8 +90,7 @@ void __init setup_arch(char **cmdline_p)
>   	config_BSP(&command_line[0], sizeof(command_line));
> 
>   #if defined(CONFIG_BOOTPARAM)
> -	strncpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));
> -	command_line[sizeof(command_line) - 1] = 0;
> +	strscpy(&command_line[0], CONFIG_BOOTPARAM_STRING, sizeof(command_line));
>   #endif /* CONFIG_BOOTPARAM */
> 
>   	process_uboot_commandline(&command_line[0], sizeof(command_line));