From 4f620fd1376729fb61e096c5df705badeedadfd9 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Thu, 30 May 2013 01:18:43 +0000 Subject: [PATCH] --- yaml --- r: 376542 b: refs/heads/master c: ea99b1adf22abd62bdcf14b1c9a0a4d3664eefd8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/setup.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 39a6d47f5cf4..7d721ea29d01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 766039022a480ede847659daaa78772bdcc598ae +refs/heads/master: ea99b1adf22abd62bdcf14b1c9a0a4d3664eefd8 diff --git a/trunk/arch/parisc/kernel/setup.c b/trunk/arch/parisc/kernel/setup.c index 76b63e726a53..1e95b2000ce8 100644 --- a/trunk/arch/parisc/kernel/setup.c +++ b/trunk/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? */