From 5326ff57d6a8b9fef46e9226828ca5fe3c7217ca Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 30 Apr 2008 00:54:52 -0700
Subject: [PATCH] --- yaml --- r: 95283 b: refs/heads/master c:
 f735295b14ae073a8302d7b1da894bc597724557 h: refs/heads/master i:   95281:
 3d8ee21c4a051e6ca02aac04ffcf92d549db788b   95279:
 defc5078b6e59ac742e12bfcba5dfff8b64954b6 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/printk.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 781296883294..1cee7d6fd9f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7511d5f66f01fc451747b24e79f3ada7a3af9af
+refs/heads/master: f735295b14ae073a8302d7b1da894bc597724557
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index e61346faf6a5..8fb01c32aa3b 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -921,7 +921,7 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
 		if (strcmp(console_cmdline[i].name, name) == 0 &&
 			  console_cmdline[i].index == idx) {
 				c = &console_cmdline[i];
-				memcpy(c->name, name_new, sizeof(c->name));
+				strlcpy(c->name, name_new, sizeof(c->name));
 				c->name[sizeof(c->name) - 1] = 0;
 				c->options = options;
 				c->index = idx_new;