From e592a08fc3459a27907ddb775d9600ed601dd603 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 29 Sep 2011 09:10:48 +0300
Subject: [PATCH] --- yaml --- r: 270440 b: refs/heads/master c:
 bb690c9e2702e49af3be2fb6f03d9b60e0afcab7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/sound/oss/sound_timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 882204ba3e5c..224eeda71fc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d900c4a1b50bc191b3ca58cbd78acc04a1c5b3
+refs/heads/master: bb690c9e2702e49af3be2fb6f03d9b60e0afcab7
diff --git a/trunk/sound/oss/sound_timer.c b/trunk/sound/oss/sound_timer.c
index 48cda6c4c257..8021c85f076d 100644
--- a/trunk/sound/oss/sound_timer.c
+++ b/trunk/sound/oss/sound_timer.c
@@ -320,7 +320,7 @@ void  sound_timer_init(struct sound_lowlev_timer *t, char *name)
 	n = sound_alloc_timerdev();
 	if (n == -1)
 		n = 0;		/* Overwrite the system timer */
-	strcpy(sound_timer.info.name, name);
+	strlcpy(sound_timer.info.name, name, sizeof(sound_timer.info.name));
 	sound_timer_devs[n] = &sound_timer;
 }
 EXPORT_SYMBOL(sound_timer_init);