Skip to contentSkip to conversation

arch: parisc: kernel: using strlcpy() instead of strcpy()

PATCH In review Chen Gang 3 participants 5 messages May 30, 2013 – Jun 3, 2013

Subsystems (2)
lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 arch: parisc: kernel: using strlcpy() instead of strcpy()

'boot_args' is an input args, and 'boot_command_line' has a fix length.

So need use strlcpy() instead of strcpy() to avoid memory overflow.

---
 arch/parisc/kernel/setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/parisc/kernel/setup.c +2 -1
index 60c1ae6..7349a3f 100644
@@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p)
 		/* called from hpux boot loader */
 		boot_command_line[0] = '\0';
 	} else {
-		strcpy(boot_command_line, (char *)__va(boot_args[1]));
+		strlcpy(boot_command_line, (char *)__va(boot_args[1]),
+			COMMAND_LINE_SIZE);
 
 #ifdef CONFIG_BLK_DEV_INITRD
 		if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
Signature · 1 line
1.7.7.6
#1 lore raw
Quoted 16 lines · Chen Gang

'boot_args' is an input args, and 'boot_command_line' has a fix length.

So need use strlcpy() instead of strcpy() to avoid memory overflow.

---
 arch/parisc/kernel/setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/parisc/kernel/setup.c +0 -0
index 60c1ae6..7349a3f 100644

arch/parisc/kernel/setup.c void __init setup_cmdline(char **cmdline_p) · line 73

Quoted 6 lines
arch/parisc/kernel/setup.c +2 -1
@@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p)
 		/* called from hpux boot loader */
 		boot_command_line[0] = '\0';
 	} else {
-		strcpy(boot_command_line, (char *)__va(boot_args[1]));
+		strlcpy(boot_command_line, (char *)__va(boot_args[1]),
+			COMMAND_LINE_SIZE);

What about add
boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
to protect the following another strcpy?

"
strcpy(command_line, boot_command_line);
"

Quoted 5 lines
arch/parisc/kernel/setup.c +0 -0
 #ifdef CONFIG_BLK_DEV_INITRD
 		if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
Signature · 1 line
1.7.7.6
author
#2 lore raw
Quoted 7 lines · Wang YanQing

What about add
boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
to protect the following another strcpy?

"
strcpy(command_line, boot_command_line);
"

If the 'dest' length is not less than COMMAND_LINE_SIZE, the strlcpy() will copy 'COMMAND_LINE_SIZE - 1' contents, and always set '\0' in the end.

So the next strcpy() will be safe.

Thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation
Acked-by on v1 1/1
#3 lore raw
In reply to Chen Gang
Quoted 5 lines · Chen Gang

'boot_args' is an input args, and 'boot_command_line' has a fix length.

So need use strlcpy() instead of strcpy() to avoid memory overflow.

This is basically impossible, since boot_args is fixed in size by palo, initialized to zero, and length checked in the bootloader. It's also only 256+4 bytes compared to the 1024 bytes set aside for boot_command_line.

That said, it's harmless to use strlcpy here, and obviously (more) correct. Thanks!

author
#4 lore raw
Quoted 6 lines · Kyle McMartin
Quoted 5 lines · Chen Gang
Quoted 5 lines

'boot_args' is an input args, and 'boot_command_line' has a fix length.

So need use strlcpy() instead of strcpy() to avoid memory overflow.

Quoted 8 lines

This is basically impossible, since boot_args is fixed in size by palo, initialized to zero, and length checked in the bootloader. It's also only 256+4 bytes compared to the 1024 bytes set aside for boot_command_line.

That said, it's harmless to use strlcpy here, and obviously (more) correct. Thanks!

OK, thanks.

Quoted 3 lines

Thank you. :-)

Signature · 3 lines
Chen Gang

Asianux Corporation