---

yaml --- r: 376542 b: refs/heads/master c: ea99b1a h: refs/heads/master v: v3
git-mirror · Jun 1, 2013 · 4f620fd · 4f620fd
1 parent 0b32f95
commit 4f620fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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? */