At Tue, 4 Oct 2011 09:29:39 +0300, Dan Carpenter wrote: > > 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@xxxxxxxxxx> Applied now. Thanks. Takashi > diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c > index 27ac611..18297f7 100644 > --- a/sound/core/oss/mixer_oss.c > +++ b/sound/core/oss/mixer_oss.c > @@ -500,7 +500,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); > } > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
