diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:23:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:23:33 -0700 |
| commit | 1ba7055af26f008e8fc8dab9dcb1701534afbe16 (patch) | |
| tree | 6156556f56eba8ebc6d50639fbc8329f5ad078a2 /arch/parisc/kernel/setup.c | |
| parent | f0f6b80368133411414762d1ce42d983ff618c95 (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
Merge 3.10-rc5 into tty-next
Diffstat (limited to 'arch/parisc/kernel/setup.c')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 60c1ae604876..7349a3fedfc7 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? */ |