diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-10-04 09:29:39 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-10-04 08:47:52 +0200 |
commit | f92766bc8948f978a838a5607bea95804c8dfdfe (patch) | |
tree | 0055886a238f44c78097b184bfdc4992ac437847 | |
parent | a0978e8039f1b1bfb9fbc68f682b14313bb4f9ad (diff) | |
download | kernel_goldelico_gta04-f92766bc8948f978a838a5607bea95804c8dfdfe.zip kernel_goldelico_gta04-f92766bc8948f978a838a5607bea95804c8dfdfe.tar.gz kernel_goldelico_gta04-f92766bc8948f978a838a5607bea95804c8dfdfe.tar.bz2 |
ALSA: oss-mixer - use strlcpy() instead strcpy()
This is mostly a static checker fix more than anything else. We're
copying from a 64 char buffer into a 44 char buffer.
The 64 character buffer is str[] in snd_mixer_oss_build_test_all().
The call tree is:
snd_mixer_oss_build_test_all()
-> snd_mixer_oss_build_test()
-> snd_mixer_oss_build_test().
We never actually do fill str[] buffer all the way to 64 characters.
The longest string is:
sprintf(str, "%s Playback Switch", ptr->name);
ptr->name is a 32 character buffer so 32 plus 16 characters for
" Playback Switch" still puts us over the 44 limit from "id.name".
Most likely ptr->name never gets filled to the limit, but we can't
really change the size of that buffer so lets just use strlcpy() here
and be safe.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/core/oss/mixer_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index d8359cf..1b5e0c4 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c @@ -499,7 +499,7 @@ static struct snd_kcontrol *snd_mixer_oss_test_id(struct snd_mixer_oss *mixer, c memset(&id, 0, sizeof(id)); id.iface = SNDRV_CTL_ELEM_IFACE_MIXER; - strcpy(id.name, name); + strlcpy(id.name, name, sizeof(id.name)); id.index = index; return snd_ctl_find_id(card, &id); } |