Skip to contentSkip to conversation

m68k: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Dec 3, 2022 – Dec 5, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

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

---
 arch/m68k/kernel/setup_no.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/kernel/setup_no.c +1 -2
index cb6def585851..37fb663559b4 100644
@@ -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));
Signature · 1 line
2.15.2
maintainer
#1 lore raw

Hi Xu,

Quoted 6 lines · On 3/12/22 16:10, [email protected] wrote:

From: Xu Panda <[email protected]>

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

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

Quoted 18 lines
---
  arch/m68k/kernel/setup_no.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/kernel/setup_no.c +1 -2
index cb6def585851..37fb663559b4 100644
@@ -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));