summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-05-30 01:18:43 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-27 10:38:43 -0700
commit753c43534ba817c8bd14b77e6fd0b43dea3892d2 (patch)
tree4a116674a6a61e88d92a093c78d8fba5907857cf
parenta56ddb0d36e20774cec963b919d6ce08d41d0e79 (diff)
downloadlwn-753c43534ba817c8bd14b77e6fd0b43dea3892d2.tar.gz
lwn-753c43534ba817c8bd14b77e6fd0b43dea3892d2.zip
parisc: kernel: using strlcpy() instead of strcpy()
commit ea99b1adf22abd62bdcf14b1c9a0a4d3664eefd8 upstream. 'boot_args' is an input args, and 'boot_command_line' has a fix length. So use strlcpy() instead of strcpy() to avoid memory overflow. Signed-off-by: Chen Gang <gang.chen@asianux.com> Acked-by: Kyle McMartin <kyle@mcmartin.ca> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/parisc/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index a3328c2616b0..3b812eb2331d 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -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? */