From: Alexander Nyberg <alexn@telia.com>
Date: Sun, 1 May 2005 15:58:52 +0000 (-0700)
Subject: [PATCH] x86_64: saved_command_line overflow fix
X-Git-Tag: v2.6.12-rc4~136^2~128
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=429e9c5eeb66fc272c15568849ad0b23689a4a06;p=linux-2.6-omap-h63xx.git

[PATCH] x86_64: saved_command_line overflow fix

This strcpy can run off the end of saved_command_line, and we don't need it any more anyway.

Signed-off-by: Alexander Nyberg <alexn@telia.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 77df2ccb08f..0f8c78dcd38 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -91,9 +91,6 @@ void __init x86_64_start_kernel(char * real_mode_data)
 #ifdef CONFIG_SMP
 	cpu_set(0, cpu_online_map);
 #endif
-	/* default console: */
-	if (!strstr(saved_command_line, "console="))
-		strcat(saved_command_line, " console=tty0"); 
 	s = strstr(saved_command_line, "earlyprintk=");
 	if (s != NULL)
 		setup_early_printk(s);