Merge 3.10-rc5 into tty-next

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index 5709c5e59be8..14285caec71a 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -394,7 +394,7 @@ EXPORT_SYMBOL(print_pci_hwpath);
 static void setup_bus_id(struct parisc_device *padev)
 {
         struct hardware_path path;
-        char name[20];
+        char name[28];
         char *output = name;
         int i;
 
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? */