Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[mirror_ubuntu-artful-kernel.git] / sound / oss / sound_timer.c

diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c
index 48cda6c4c257b34d191d3512ff52658de4329669..8021c85f076d09aa1c118473607e67219b04fc16 100644 (file)
--- a/sound/oss/sound_timer.c
+++ b/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);