Skip to contentSkip to conversation

arch: sparc: Use strscpy to replace strlcpy

PATCH New 陈学兵 1 participant 1 message May 22, 2022 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

陈学兵

author
#0 lore raw

PATCH 1/1 arch: sparc: Use strscpy to replace strlcpy

The strlcpy should not be used because it doesn't limit the source length. Preferred is strscpy.

---
 arch/sparc/kernel/ioport.c   | 2 +-
 arch/sparc/kernel/setup_32.c | 2 +-
 arch/sparc/kernel/setup_64.c | 2 +-
 arch/sparc/prom/bootstr_32.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/sparc/kernel/ioport.c +1 -1
index 4e4f3d3263e4..a8cbe403301f 100644
@@ -191,7 +191,7 @@ static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys,
 		tack += sizeof (struct resource);
 	}
 
-	strlcpy(tack, name, XNMLN+1);
+	strscpy(tack, name, XNMLN+1);
 	res->name = tack;
 
 	va = _sparc_ioremap(res, busno, phys, size);
arch/sparc/kernel/setup_32.c +1 -1
index c8e0dd99f370..ace0e9adfd77 100644
@@ -302,7 +302,7 @@ void __init setup_arch(char **cmdline_p)
 
 	/* Initialize PROM console and command line. */
 	*cmdline_p = prom_getbootargs();
-	strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
+	strscpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
 	parse_early_param();
 
 	boot_flags_init(*cmdline_p);
arch/sparc/kernel/setup_64.c +1 -1
index 48abee4eee29..6546ca9d4d3f 100644
@@ -636,7 +636,7 @@ void __init setup_arch(char **cmdline_p)
 {
 	/* Initialize PROM console and command line. */
 	*cmdline_p = prom_getbootargs();
-	strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
+	strscpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
 	parse_early_param();
 
 	boot_flags_init(*cmdline_p);
arch/sparc/prom/bootstr_32.c +1 -1
index e3b731ff00f0..1c7cd258b0dc 100644
@@ -52,7 +52,7 @@ prom_getbootargs(void)
 		 * V3 PROM cannot supply as with more than 128 bytes
 		 * of an argument. But a smart bootstrap loader can.
 		 */
-		strlcpy(barg_buf, *romvec->pv_v2bootargs.bootargs, sizeof(barg_buf));
+		strscpy(barg_buf, *romvec->pv_v2bootargs.bootargs, sizeof(barg_buf));
 		break;
 	default:
 		break;
Signature · 1 line
2.36.1