[PATCH v2] m68k/kernel: replace strncpy() with strscpy()

[PATCH v2] m68k/kernel: replace strncpy() with strscpy()

[Mohammad Mahdi Anbaraki]

Swapped out strncpy() for strscpy() in parse_uboot_commandline() while
copying to commandp. strscpy() makes sure the string is properly null-
terminated and gives a more useful return value so it's just a safer 
choice overall.

Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Mohammad Mahdi Anbaraki <m.mahdianbaraki@gmail.com>
---
Changes in v2:
- s/m64/m68

 arch/m68k/kernel/uboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
index 5e52ea150..fa7c279ea 100644
--- a/arch/m68k/kernel/uboot.c
+++ b/arch/m68k/kernel/uboot.c
@@ -73,7 +73,7 @@ static void __init parse_uboot_commandline(char *commandp, int size)
 	uboot_cmd_end = sp[5];
 
 	if (uboot_cmd_start && uboot_cmd_end)
-		strncpy(commandp, (const char *)uboot_cmd_start, size);
+		strscpy(commandp, (const char *)uboot_cmd_start, size);
 
 #if defined(CONFIG_BLK_DEV_INITRD)
 	uboot_initrd_start = sp[2];
-- 
2.43.0

Re: [PATCH v2] m68k/kernel: replace strncpy() with strscpy()

[mohammad mahdi anbaraki]

Hi
.Just a gentle follow-up on this patch
/s/m64k/m68k

‫‪Mohammad Mahdi Anbaraki‬‏ <‪m.mahdianbaraki@gmail.com‬‏> در تاریخ
پنجشنبه ۳ آوریل ۲۰۲۵ ساعت ۲۱:۴۲ نوشت:‬
>
> Swapped out strncpy() for strscpy() in parse_uboot_commandline() while
> copying to commandp. strscpy() makes sure the string is properly null-
> terminated and gives a more useful return value so it's just a safer
> choice overall.
>
> Link: https://github.com/KSPP/linux/issues/90
> Signed-off-by: Mohammad Mahdi Anbaraki <m.mahdianbaraki@gmail.com>
> ---
> Changes in v2:
> - s/m64/m68
>
>  arch/m68k/kernel/uboot.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
> index 5e52ea150..fa7c279ea 100644
> --- a/arch/m68k/kernel/uboot.c
> +++ b/arch/m68k/kernel/uboot.c
> @@ -73,7 +73,7 @@ static void __init parse_uboot_commandline(char *commandp, int size)
>         uboot_cmd_end = sp[5];
>
>         if (uboot_cmd_start && uboot_cmd_end)
> -               strncpy(commandp, (const char *)uboot_cmd_start, size);
> +               strscpy(commandp, (const char *)uboot_cmd_start, size);
>
>  #if defined(CONFIG_BLK_DEV_INITRD)
>         uboot_initrd_start = sp[2];
> --
> 2.43.0
>

Re: [PATCH v2] m68k/kernel: replace strncpy() with strscpy()

[Greg Ungerer]

Hi Homammad,

On 4/4/25 04:11, Mohammad Mahdi Anbaraki wrote:
> Swapped out strncpy() for strscpy() in parse_uboot_commandline() while
> copying to commandp. strscpy() makes sure the string is properly null-
> terminated and gives a more useful return value so it's just a safer
> choice overall.
> 
> Link: https://github.com/KSPP/linux/issues/90
> Signed-off-by: Mohammad Mahdi Anbaraki <m.mahdianbaraki@gmail.com>

Thanks. Seeing as this only affects nommu/coldfire I will apply this
to the m68knommu git tree, for-next branch.

Regards
Greg


> ---
> Changes in v2:
> - s/m64/m68
> 
>   arch/m68k/kernel/uboot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
> index 5e52ea150..fa7c279ea 100644
> --- a/arch/m68k/kernel/uboot.c
> +++ b/arch/m68k/kernel/uboot.c
> @@ -73,7 +73,7 @@ static void __init parse_uboot_commandline(char *commandp, int size)
>   	uboot_cmd_end = sp[5];
>   
>   	if (uboot_cmd_start && uboot_cmd_end)
> -		strncpy(commandp, (const char *)uboot_cmd_start, size);
> +		strscpy(commandp, (const char *)uboot_cmd_start, size);
>   
>   #if defined(CONFIG_BLK_DEV_INITRD)
>   	uboot_initrd_start = sp[2];